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