summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-07-07 17:26:27 +0200
committerSamuli Piippo <samuli.piippo@digia.com>2014-08-13 13:14:18 +0200
commit78e3c84e1d932817543f275442dabd4af086fcbf (patch)
tree883d7a136cfbb35abeb6b171365b8fdca4aa499d
parentb9a612e20e371458a284cb3b8c66535b34d997d4 (diff)
Fix the build with recent qtbase0.9
Since 3cd70c11bc7bbe3c5e9e4972d2273cf51bbdc30e in qtbase Qt modules require cmake tests to be present which makes QtWebEngine fail with "Missing CMake tests." We do not support building with cmake at this point, so disable these tests by setting CMAKE_MODULE_TESTS to '-' for module pro files. Cherry-picked from: 1.0/bef6cc644f176a69a85c68126bd0d7e50ab5757e Change-Id: I41d5006c48ea51cbaad919072dced414a923c97f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--src/core/core_module.pro2
-rw-r--r--src/webengine/webengine.pro2
-rw-r--r--src/webenginewidgets/webenginewidgets.pro2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 1d5ea6be..644043ce 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -4,6 +4,8 @@ TARGET = QtWebEngineCore
# We depend on libc++ to build chromium so our macosx-version-min has to be 10.7
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+CMAKE_MODULE_TESTS = "-"
+
QT += qml quick
QT_PRIVATE += qml-private quick-private gui-private core-private
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index 36ef1b67..c379e2ed 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -1,5 +1,7 @@
TARGET = QtWebEngine
+CMAKE_MODULE_TESTS = "-"
+
# For our export macros
DEFINES += QT_BUILD_WEBENGINE_LIB
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 1f2eb84b..0901beb2 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -1,5 +1,7 @@
TARGET = QtWebEngineWidgets
+CMAKE_MODULE_TESTS = "-"
+
# For our export macros
DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB