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 ----
 1 file changed, 4 deletions(-)

(limited to 'tools/qmake/mkspecs/features/configure.prf')

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