diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-05-01 07:38:12 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-06-12 08:39:19 +0000 |
| commit | 2715088397641a85c1fb61d64bdb4c677713337f (patch) | |
| tree | 030309fb1dbf51553273f0b1948087088e6d4935 /mkspecs | |
| parent | b7f36051fb0bd16fa61e08ecd77978a45a125dea (diff) | |
Fine tune configure and clean up header includes
Previously configure was generating two config headers
qtwebengine-config.h and qtwebengine-config_p.h, however
those headers were never installed or included as dependency
in Makefiles. Moreover, due to the name clash all features
were included into qt_lib_webengine_*.pri which is
QtWebEngine QML module.
Move configure to core so all features belong now to
qt_lib_webenginecore*.pri. Fix global includes to include
qtwebenginecore-config*.h.
Drop all DEFINES and use QT_CONFIG instead.
Cleanup all evil looking includes in headers for webengine and
webenginewidgets.
Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/platform.prf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index f8c154655..21c2f8c01 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -27,8 +27,8 @@ defineTest(runConfigure) { return(false) } - include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) - QT_FOR_CONFIG += webengine-private + include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) + QT_FOR_CONFIG += webenginecore-private !qtConfig(webengine-v8-snapshot-support):qtConfig(webengine-v8-snapshot) { skipBuild("V8 snapshot cannot be built. Most likely, the 32-bit host compiler does not work."\ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index 2c8ef43a5..33b71b231 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -1,5 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) +QT_FOR_CONFIG += webenginecore-private defineTest(isQtMinimum) { !equals(QT_MAJOR_VERSION, $$1): return(false) |