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 /configure.pri | |
| 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 'configure.pri')
| -rw-r--r-- | configure.pri | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/configure.pri b/configure.pri index f94624053..196c9abb1 100644 --- a/configure.pri +++ b/configure.pri @@ -149,20 +149,6 @@ defineTest(qtConfTest_detectEmbedded) { return(false) } -defineTest(qtConfTest_detectXcb) { - #workaround for for not working 'depends' in main configure when no 'module' - QT_FOR_CONFIG += gui-private - qtConfig(xcb): return(true) - return(false) -} - -defineTest(qtConfTest_detectDeveloperBuild) { - #workaround for for not working 'depends' in main configure when no 'module' - QT_FOR_CONFIG += core-private - qtConfig(private_tests): return(true) # enabled for developer-build - return(false) -} - defineTest(qtConfTest_detectHostPkgConfig) { PKG_CONFIG = $$qtConfPkgConfig(true) isEmpty(PKG_CONFIG) { |