From 78e3c84e1d932817543f275442dabd4af086fcbf Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 7 Jul 2014 17:26:27 +0200 Subject: 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. Cherry-picked from: 1.0/bef6cc644f176a69a85c68126bd0d7e50ab5757e Change-Id: I41d5006c48ea51cbaad919072dced414a923c97f Reviewed-by: Andras Becsi --- src/core/core_module.pro | 2 ++ src/webengine/webengine.pro | 2 ++ src/webenginewidgets/webenginewidgets.pro | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 1d5ea6be0..644043cef 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 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 1f2eb84b3..0901beb21 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 -- cgit v1.2.1