diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-09-13 18:10:18 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-19 07:51:06 +0000 |
| commit | bd97ecd3f617b21fa56a2717abcf76518697b1e3 (patch) | |
| tree | dbeac6d0fddbd2432f87df23ab21085ba912508c /src/buildtools | |
| parent | 6347e3195c6934c0f3aa4668a55a285336dd407a (diff) | |
Cleanup skipBuild code
Move all skipBuild related checks to runConfigure()
in configure.prf. Remove some unused functions.
Move platform checks to separate prf file.
Change-Id: Ia45c837c91c341ed1fbc2e32fc098329da989920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/gn.pro | 6 | ||||
| -rw-r--r-- | src/buildtools/ninja.pro | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index db4bbf82c..02d3df652 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -3,10 +3,8 @@ option(host_build) !debug_and_release: CONFIG += release -isQtMinimum(5, 8) { - include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) - QT_FOR_CONFIG += webengine-private -} +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private build_pass|!debug_and_release { !qtConfig(system-gn): CONFIG(release, debug|release) { diff --git a/src/buildtools/ninja.pro b/src/buildtools/ninja.pro index 1b17c6dfa..c99513f85 100644 --- a/src/buildtools/ninja.pro +++ b/src/buildtools/ninja.pro @@ -2,10 +2,9 @@ TEMPLATE = aux !debug_and_release: CONFIG += release -isQtMinimum(5, 8) { - include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) - QT_FOR_CONFIG += webengine-private -} +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + build_pass|!debug_and_release { !qtConfig(system-ninja): CONFIG(release, debug|release) { |