1From 22d7a9050b04b021e33430d0f7e3c5ee80c24caa Mon Sep 17 00:00:00 2001
2From: Peter Seiderer <ps.report@gmx.net>
3Date: Tue, 17 Dec 2019 11:01:59 +0100
4Subject: [PATCH] Disable designer tool (fixes configure error).
5
6Fixes:
7
8  .../build/qt5tools-5.14.0/src/designer/src/components/lib/lib.pro
9  Project ERROR: Multiple modules claim plugin type 'designer' (uitools, in addition to designer)
10
11Signed-off-by: Peter Seiderer <ps.report@gmx.net>
12[Rebased for Qt5.15.0]
13Signed-off-by: Peter Seiderer <ps.report@gmx.net>
14[Rebased for Qt5.15.1]
15Signed-off-by: Peter Seiderer <ps.report@gmx.net>
16[Rebased for Qt5.15.2]
17Signed-off-by: Peter Seiderer <ps.report@gmx.net>
18---
19 src/linguist/linguist/linguist.pro | 2 +-
20 src/src.pro                        | 5 +----
21 2 files changed, 2 insertions(+), 5 deletions(-)
22
23diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
24index d083896..7d74cfc 100644
25--- a/src/linguist/linguist/linguist.pro
26+++ b/src/linguist/linguist/linguist.pro
27@@ -1,4 +1,4 @@
28-QT += core-private gui-private widgets uitools-private printsupport
29+QT += core-private gui-private widgets printsupport
30
31 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
32
33diff --git a/src/src.pro b/src/src.pro
34index f2675c7..360de50 100644
35--- a/src/src.pro
36+++ b/src/src.pro
37@@ -6,12 +6,9 @@ qtHaveModule(widgets) {
38     } else {
39         QT_FOR_CONFIG += widgets
40         qtConfig(pushbutton):qtConfig(toolbutton) {
41-            SUBDIRS = designer \
42-                      pixeltool
43+            SUBDIRS = pixeltool
44
45             !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
46-
47-            linguist.depends = designer
48         }
49         qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
50     }
51--
522.29.2
53
54