diff options
author | Michal Klocek <michal.klocek@qt.io> | 2019-08-14 12:05:50 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-07 19:53:17 +0000 |
commit | 8684373c08a774a7ed23682a358de991b8775ddd (patch) | |
tree | 2ac9cd772a77e949b629f11447ed8b332ddf3417 /mkspecs | |
parent | f7032b40a28f844e4a94633bbc077b1953ef0ed4 (diff) |
Move main configure and move some tests from core to buildtools
Processing configuration for gn when building qpdfcore module
will require optional libraries resolved. Some libs are not needed,
but this requires extra patching of gn build configs; so
to keep things simple, just detect all the libs beforehand.
Unfortunately using this for main configure goes bonkers.
The issue here is that main configure resets features in global scope,
which can break features coming from qtbase and results in
bogus configurations in certain cases. Therefore move current
configuration to buildtools and make everything else depend on this.
Task-number: QTBUG-75840
Task-number: QTBUG-76606
Change-Id: Id87f5ba017541a2d5a2836510c6cabc5a19f92c6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/functions.prf | 4 | ||||
-rw-r--r-- | mkspecs/features/platform.prf | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index f858243e1..e6c74fc87 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -130,8 +130,8 @@ defineTest(isWebEngineCoreBuild) { return(false) } - include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) - QT_FOR_CONFIG += webenginecore-private + include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) + QT_FOR_CONFIG += buildtools-private win32:!qtConfig(webengine-win-compiler64) { skipBuild("Required 64-bit cross-building or native toolchain could not be found.") diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index bdd81d337..97cf96a78 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -1,4 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/src/qtwebengine-main-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) +QT_FOR_CONFIG += buildtools-private defineTest(isQtMinimum) { !equals(QT_MAJOR_VERSION, $$1): return(false) |