diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-09-13 19:12:38 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-20 10:43:09 +0000 |
commit | 1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 (patch) | |
tree | daf2617622536fc9c96ed9818ecba3d892f999b7 /tests | |
parent | c9b3baa2e2825df6b06e7366d154341f73d4e326 (diff) |
Remove WEBENGINE_CONFIG from configure
Do not store flags in qmake.cache with WEBENGINE_CONFIG.
Use directly qtConfig values insted. This makes configuration
more consistent, simplifies handling and avoids passing
values from qtConfig to WEBENIGNE_CONFIG, which then
were passed to gn.
[ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure
Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquickwebengineview/qquickwebengineview.pro | 2 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginepage/qwebenginepage.pro | 2 | ||||
-rw-r--r-- | tests/auto/widgets/tests.pri | 3 | ||||
-rw-r--r-- | tests/auto/widgets/widgets.pro | 7 |
4 files changed, 10 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro index df9b3e1b7..0f62ec21d 100644 --- a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro +++ b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro @@ -5,7 +5,7 @@ QT_PRIVATE += webengine-private gui-private HEADERS += ../shared/util.h -use?(pdf) { +qtConfig(printing-and-pdf) { DEFINES += ENABLE_PDF } diff --git a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro index e0765736e..a2dbd4d70 100644 --- a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro +++ b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro @@ -1,4 +1,4 @@ include(../tests.pri) QT *= core-private -contains(WEBENGINE_CONFIG, use_pdf): DEFINES+=QWEBENGINEPAGE_PDFPRINTINGENABLED +qtConfig(printing-and-pdf): DEFINES+=QWEBENGINEPAGE_PDFPRINTINGENABLED diff --git a/tests/auto/widgets/tests.pri b/tests/auto/widgets/tests.pri index d77cd5af5..dc0461e2b 100644 --- a/tests/auto/widgets/tests.pri +++ b/tests/auto/widgets/tests.pri @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + TEMPLATE = app CONFIG += testcase diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index 441eea0fa..60e5cc11f 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + TEMPLATE = subdirs SUBDIRS += \ @@ -14,8 +17,8 @@ SUBDIRS += \ qwebenginesettings \ qwebengineview -contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile { - !contains(WEBENGINE_CONFIG, use_native_spellchecker) { +qtConfig(spellchecker):!cross_compile { + !qtConfig(native-spellchecker) { SUBDIRS += qwebenginespellcheck } else { message("Spellcheck test will not be built because it depends on usage of Hunspell dictionaries.") |