0001-Disable-designer-tool-fixes-configure-error.patch 1.8 KB

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