diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-20 19:45:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-08 22:27:09 +0000 |
| commit | 95da2313197aafc06cc6cb3ab730e8d036fb2895 (patch) | |
| tree | 5f08f8c5b67c967ede62d79ff81217ff9b23a3f7 | |
| parent | c15c0f5620a15996f4d178e628f5bd401ab34279 (diff) | |
move invocation of (old style) configuration to top-level project
there doesn't appear to be a reason for magically invoking the
configuration from default_pre/post, and it would cause problems further
down the line with the new configure system.
Change-Id: I3cf743a444e96bb397116f2ad4dce923f57aacfc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | qtwebengine.pro | 13 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 4 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/default_post.prf | 11 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 11 |
4 files changed, 13 insertions, 26 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro index 3d20cc2f4..3fd5c12e6 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -1,6 +1,19 @@ load(qt_build_config) load(qt_parts) +isPlatformSupported() { + !exists(src/3rdparty/chromium): \ + error("Submodule qtwebengine-chromium does not exist. Run 'git submodule update --init'.") + load(configure) + runConfigure() +} + +!isEmpty(skipBuildReason) { + SUBDIRS = + log($${skipBuildReason}$${EOL}) + log(QtWebEngine will not be built.$${EOL}) +} + OTHER_FILES = \ tools/buildscripts/* \ tools/scripts/* \ diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 012f44558..675787bcf 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -83,11 +83,7 @@ defineTest(runConfigure) { export(WEBENGINE_CONFIG) } } -} -# This is called from default_post, at which point we've also parsed -# command line options -defineTest(finalizeConfigure) { unix:!darwin { log("System library dependencies:$${EOL}") use?(system_icu) { diff --git a/tools/qmake/mkspecs/features/default_post.prf b/tools/qmake/mkspecs/features/default_post.prf deleted file mode 100644 index 64e8cb1fe..000000000 --- a/tools/qmake/mkspecs/features/default_post.prf +++ /dev/null @@ -1,11 +0,0 @@ -load(default_post) -load(functions) - -root_project_file:isPlatformSupported(): finalizeConfigure() - -!isEmpty(skipBuildReason) { - SUBDIRS = - export(SUBDIRS) - log($${skipBuildReason}$${EOL}) - log(QtWebEngine will not be built.$${EOL}) -} diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 1557a0533..77e437bc9 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -21,14 +21,3 @@ EOL = $$escape_expand(\\n) # Call the original default_pre. load(default_pre) load(functions) - -# Check platform support and run config tests early enough to bail -equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): CONFIG += root_project_file - -root_project_file:isPlatformSupported() { - !exists($$QTWEBENGINE_ROOT/src/3rdparty/chromium) { - error("Submodule qtwebengine-chromium does not exist. Run 'git submodule update --init'.") - } - load(configure) - runConfigure() -} |