99a676dc8a
ecm_find_qmlmodule checks if QML modules are installed, and if not it warns during build time. This is purely for packager knowledge. Not finding those packages here doesn't affect the runtime of the kwin_wayland at all. We are disabling this due to bug in the qmlplugindump which causes it to not return and get stuck, See issue #28. Revert this when QTBUG-70460 is solved upstream.
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From a6ac58ff3de0393c7dde05bc379d06c36a0ccb68 Mon Sep 17 00:00:00 2001
|
|
From: Bhushan Shah <bhush94@gmail.com>
|
|
Date: Wed, 12 Sep 2018 11:51:29 +0530
|
|
Subject: [PATCH] Disable finding of qml modules
|
|
|
|
---
|
|
CMakeLists.txt | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 554a9263d..0b058126e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -275,16 +275,16 @@ set_package_properties(Libcap PROPERTIES
|
|
)
|
|
set(HAVE_LIBCAP ${Libcap_FOUND})
|
|
|
|
-include(ECMQMLModules)
|
|
-ecm_find_qmlmodule(QtQuick 2.3)
|
|
-ecm_find_qmlmodule(QtQuick.Controls 1.2)
|
|
-ecm_find_qmlmodule(QtQuick.Layouts 1.3)
|
|
-ecm_find_qmlmodule(QtQuick.VirtualKeyboard 2.1)
|
|
-ecm_find_qmlmodule(QtQuick.Window 2.1)
|
|
-ecm_find_qmlmodule(QtMultimedia 5.0)
|
|
-ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
|
|
-ecm_find_qmlmodule(org.kde.plasma.core 2.0)
|
|
-ecm_find_qmlmodule(org.kde.plasma.components 2.0)
|
|
+#include(ECMQMLModules)
|
|
+#ecm_find_qmlmodule(QtQuick 2.3)
|
|
+#ecm_find_qmlmodule(QtQuick.Controls 1.2)
|
|
+#ecm_find_qmlmodule(QtQuick.Layouts 1.3)
|
|
+#ecm_find_qmlmodule(QtQuick.VirtualKeyboard 2.1)
|
|
+#ecm_find_qmlmodule(QtQuick.Window 2.1)
|
|
+#ecm_find_qmlmodule(QtMultimedia 5.0)
|
|
+#ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
|
|
+#ecm_find_qmlmodule(org.kde.plasma.core 2.0)
|
|
+#ecm_find_qmlmodule(org.kde.plasma.components 2.0)
|
|
|
|
########### configure tests ###############
|
|
include(CMakeDependentOption)
|
|
--
|
|
2.18.0
|
|
|