aboutsummaryrefslogtreecommitdiff
path: root/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch')
-rw-r--r--package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch25
1 files changed, 16 insertions, 9 deletions
diff --git a/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch b/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch
index 20c5e2a470..cf2cd94c28 100644
--- a/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch
+++ b/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch
@@ -1,4 +1,4 @@
-From a70da8d731b969305096a0213b70659dc641591a Mon Sep 17 00:00:00 2001
+From 22d7a9050b04b021e33430d0f7e3c5ee80c24caa Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Tue, 17 Dec 2019 11:01:59 +0100
Subject: [PATCH] Disable designer tool (fixes configure error).
@@ -11,10 +11,14 @@ Fixes:
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Rebased for Qt5.15.0]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+[Rebased for Qt5.15.1]
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+[Rebased for Qt5.15.2]
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
src/linguist/linguist/linguist.pro | 2 +-
- src/src.pro | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
+ src/src.pro | 5 +----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index d083896..7d74cfc 100644
@@ -27,20 +31,23 @@ index d083896..7d74cfc 100644
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
diff --git a/src/src.pro b/src/src.pro
-index 5c256ea..6d079be 100644
+index f2675c7..360de50 100644
--- a/src/src.pro
+++ b/src/src.pro
-@@ -7,10 +7,7 @@ qtHaveModule(widgets) {
+@@ -6,12 +6,9 @@ qtHaveModule(widgets) {
+ } else {
QT_FOR_CONFIG += widgets
qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
-- designer \
- pixeltool
+- SUBDIRS = designer \
+- pixeltool
++ SUBDIRS = pixeltool
+
+ !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
}
qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
}
--
-2.26.2
+2.29.2