From 3f0741da9fce9c60822ee29d85d63c507ad2111b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 1 Jan 2019 17:52:08 +0100 Subject: [PATCH] kdeclarative: Fix build if QML-debugger was not enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-only-if-qtdeclarative-was-build-wit.patch | 35 +++++++++++++++++++ .../kf5/tier3/kdeclarative/kdeclarative.bb | 5 ++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 recipes-kde/kf5/tier3/kdeclarative/files/0002-Use-QML-debugger-only-if-qtdeclarative-was-build-wit.patch diff --git a/recipes-kde/kf5/tier3/kdeclarative/files/0002-Use-QML-debugger-only-if-qtdeclarative-was-build-wit.patch b/recipes-kde/kf5/tier3/kdeclarative/files/0002-Use-QML-debugger-only-if-qtdeclarative-was-build-wit.patch new file mode 100644 index 00000000..976b7105 --- /dev/null +++ b/recipes-kde/kf5/tier3/kdeclarative/files/0002-Use-QML-debugger-only-if-qtdeclarative-was-build-wit.patch @@ -0,0 +1,35 @@ +From b9358754fa2d8cbca5ec2bcb89629edc5902f036 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 1 Jan 2019 17:44:23 +0100 +Subject: [PATCH] Use QML-debugger only if qtdeclarative was build with + debugger support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/kdeclarative/kdeclarative.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/kdeclarative/kdeclarative.cpp b/src/kdeclarative/kdeclarative.cpp +index b3906e2..9318af9 100644 +--- a/src/kdeclarative/kdeclarative.cpp ++++ b/src/kdeclarative/kdeclarative.cpp +@@ -133,9 +133,11 @@ QString KDeclarative::translationDomain() const + + void KDeclarative::setupQmlJsDebugger() + { ++#ifndef QT_NO_QML_DEBUGGER + if (QCoreApplication::arguments().contains(QLatin1String("-qmljsdebugger"))) { + QQmlDebuggingEnabler enabler; + } ++#endif + } + + QString KDeclarative::defaultComponentsTarget() +-- +2.20.1 + diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb index a2d64719..72bcd61b 100644 --- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb +++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb @@ -10,7 +10,10 @@ DEPENDS += "qtdeclarative kconfig kconfig-native ki18n kiconthemes kio kwidgetsa kwindowsystem kglobalaccel kguiaddons kpackage libepoxy gettext-native \ kcoreaddons-native kauth-native kpackage-native" -SRC_URI += "file://0001-kpackagelauncherqml-Add-include-of-QDebug.patch" +SRC_URI += " \ + file://0001-kpackagelauncherqml-Add-include-of-QDebug.patch \ + file://0002-Use-QML-debugger-only-if-qtdeclarative-was-build-wit.patch \ +" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "5febec6dc30c02caac9c46fc48d8a92a"