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

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From ba3c7c2233e8d4875abd6c391764d87a9bd59c5d 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. ---
  10. src/linguist/linguist/linguist.pro | 2 +-
  11. src/src.pro | 3 ---
  12. 2 files changed, 1 insertion(+), 4 deletions(-)
  13. diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
  14. index af74df8..d7dfd7a 100644
  15. --- a/src/linguist/linguist/linguist.pro
  16. +++ b/src/linguist/linguist/linguist.pro
  17. @@ -1,4 +1,4 @@
  18. -QT += core-private gui-private widgets xml uitools-private printsupport
  19. +QT += core-private gui-private widgets xml printsupport
  20. DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
  21. diff --git a/src/src.pro b/src/src.pro
  22. index 5c256ea..6d079be 100644
  23. --- a/src/src.pro
  24. +++ b/src/src.pro
  25. @@ -7,10 +7,7 @@ qtHaveModule(widgets) {
  26. QT_FOR_CONFIG += widgets
  27. qtConfig(pushbutton):qtConfig(toolbutton) {
  28. SUBDIRS = assistant \
  29. - designer \
  30. pixeltool
  31. -
  32. - linguist.depends = designer
  33. }
  34. qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
  35. }
  36. --
  37. 2.23.0