From 95da2313197aafc06cc6cb3ab730e8d036fb2895 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 20 Oct 2016 19:45:22 +0200
Subject: 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>
---
 tools/qmake/mkspecs/features/configure.prf    |  4 ----
 tools/qmake/mkspecs/features/default_post.prf | 11 -----------
 tools/qmake/mkspecs/features/default_pre.prf  | 11 -----------
 3 files changed, 26 deletions(-)
 delete mode 100644 tools/qmake/mkspecs/features/default_post.prf

(limited to 'tools')

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()
-}
-- 
cgit v1.2.3