diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-07-07 17:26:27 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-07-07 18:21:21 +0200 |
commit | bef6cc644f176a69a85c68126bd0d7e50ab5757e (patch) | |
tree | 5b92b01862f885590d84e6fb34021f9f75082a66 /src | |
parent | 02cbb1d1bb306e04548ae6a4fb4a7157e39e0f84 (diff) |
Fix the build with recent qtbase
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.
Change-Id: I777e6b2c7ce975ad021281800987f9d3ce173399
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/core_module.pro | 2 | ||||
-rw-r--r-- | src/webengine/webengine.pro | 2 | ||||
-rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index ffea48b47..1548a4d3f 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -1,6 +1,8 @@ MODULE = webenginecore TARGET = QtWebEngineCore +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 36ef1b67a..c379e2eda 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 3134980d5..d130f7461 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 |