0fa4eb375c
qt5base: - remove 0005-evdevkeyboard-fix-input_event-time-related-compile.patch (upstream [1]) - remove 0006-evdevtouch-fix-input_event-time-related-compile.patch (upstream [2]) - remove 0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch (upstream [3]) qt5declarative: - remove 0002-examples-fix-parallel-install.patch (superseeded by upstream commit [4]) qt5imageformats: - remove 0001-fix-build-on-Arch-Linux.patch (upstream [5]) qt5tools: - rebased 0001-Disable-designer-tool-fixes-configure-error.patch qt5webengine: - remove 0002-fix-bison-3.7.patch (upstream [6]) - now unconditionally needs libxkbcommon [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=c5b8b662105cc5ced968da9f567fe1134c52d6b5 [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=71fb4d081c7f3675939ac8c62063631a18175fd1 [3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2246f270ffd3875cad8c334fdf4878be48620514 [4] https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=1f0b3a54ffa2ab0dc0cdff1345980ea68d749d24 [5] https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36 [6] https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=80-based&id=1a53f5995697f5ac6fd501dbdc0ee39c9488ee66 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 34894c12122b2026aa595b42fe84a4648a6b7992 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).
|
|
|
|
Fixes:
|
|
|
|
.../build/qt5tools-5.14.0/src/designer/src/components/lib/lib.pro
|
|
Project ERROR: Multiple modules claim plugin type 'designer' (uitools, in addition to designer)
|
|
|
|
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>
|
|
---
|
|
src/linguist/linguist/linguist.pro | 2 +-
|
|
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
|
|
--- a/src/linguist/linguist/linguist.pro
|
|
+++ b/src/linguist/linguist/linguist.pro
|
|
@@ -1,4 +1,4 @@
|
|
-QT += core-private gui-private widgets uitools-private printsupport
|
|
+QT += core-private gui-private widgets printsupport
|
|
|
|
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
|
|
|
|
diff --git a/src/src.pro b/src/src.pro
|
|
index 8ed567b..d784808 100644
|
|
--- a/src/src.pro
|
|
+++ b/src/src.pro
|
|
@@ -6,12 +6,9 @@ qtHaveModule(widgets) {
|
|
} else {
|
|
QT_FOR_CONFIG += widgets
|
|
qtConfig(pushbutton):qtConfig(toolbutton) {
|
|
- SUBDIRS = designer \
|
|
- pixeltool
|
|
+ SUBDIRS = pixeltool
|
|
|
|
!static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant
|
|
-
|
|
- linguist.depends = designer
|
|
}
|
|
qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
|
|
}
|
|
--
|
|
2.28.0
|
|
|