From d8f18e2b918e2f7c8149d3e6cd1510b27bde7dfd Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 13 Sep 2017 18:42:23 +0200 Subject: Add testsupport to new configure system Change-Id: I123ce22ea3a3d8b7b80c67fa322cb817d924f2e0 Reviewed-by: Allan Sandfeld Jensen --- src/src.pro | 2 +- src/webengine/webengine.pro | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index d994fc0e9..fabead2a0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -26,7 +26,7 @@ use?(spellchecker):!use?(native_spellchecker):!cross_compile { qwebengine_convert_dict.depends = core } -isQMLTestSupportApiEnabled() { +qtConfig(testsupport) { webengine_testsupport_plugin.subdir = webengine/plugin/testsupport webengine_testsupport_plugin.target = sub-webengine-testsupport-plugin webengine_testsupport_plugin.depends = webengine diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index f4bc65edb..ac2727580 100644 --- a/src/webengine/webengine.pro +++ b/src/webengine/webengine.pro @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + TARGET = QtWebEngine # For our export macros @@ -55,7 +58,7 @@ HEADERS = \ render_widget_host_view_qt_delegate_quickwindow.h \ ui_delegates_manager.h -isQMLTestSupportApiEnabled() { +qtConfig(testsupport) { QT += testlib SOURCES += api/qquickwebenginetestsupport.cpp -- cgit v1.2.3