Merge remote-tracking branch 'origin/5.8.0' into 5.8

Change-Id: Iac71a5d02bdec7a00d17136048e6379c32c53d24

7 files changed, 3 insertions, 14 deletions

diff --git a/Tools/qmake/.qmake.conf b/Tools/qmake/.qmake.conf
index 2f0dc8976..80b775807 100644
--- a/Tools/qmake/.qmake.conf
+++ b/Tools/qmake/.qmake.conf
@@ -1,2 +1,5 @@
 # This file is only here to isolate the configure project
 # from the rest of the tree.
+
+# Still, we need the global Qt build configuration.
+load(qt_build_config)
diff --git a/Tools/qmake/config.tests/icu/icu.pro b/Tools/qmake/config.tests/icu/icu.pro
index 212b7d70e..15c6bb915 100644
--- a/Tools/qmake/config.tests/icu/icu.pro
+++ b/Tools/qmake/config.tests/icu/icu.pro
@@ -18,5 +18,3 @@ win32 {
 } else {
     LIBS += -licui18n -licuuc -licudata
 }
-
-load(qt_build_config)
diff --git a/Tools/qmake/config.tests/leveldb/leveldb.pro b/Tools/qmake/config.tests/leveldb/leveldb.pro
index f28cfd155..2d64eeba9 100644
--- a/Tools/qmake/config.tests/leveldb/leveldb.pro
+++ b/Tools/qmake/config.tests/leveldb/leveldb.pro
@@ -1,5 +1,3 @@
 SOURCES = leveldb.cpp
 OBJECTS_DIR = obj
 LIBS += -lleveldb -lmemenv
-
-load(qt_build_config)
diff --git a/Tools/qmake/config.tests/libsqlite3/libsqlite3.pro b/Tools/qmake/config.tests/libsqlite3/libsqlite3.pro
index 2c39c5266..e5ae30612 100644
--- a/Tools/qmake/config.tests/libsqlite3/libsqlite3.pro
+++ b/Tools/qmake/config.tests/libsqlite3/libsqlite3.pro
@@ -1,5 +1,3 @@
 SOURCES = libsqlite3.cpp
 OBJECTS_DIR = obj
 LIBS += -lsqlite3
-
-load(qt_build_config)
diff --git a/Tools/qmake/config.tests/libwebp/libwebp.pro b/Tools/qmake/config.tests/libwebp/libwebp.pro
index 700c44df6..925725270 100644
--- a/Tools/qmake/config.tests/libwebp/libwebp.pro
+++ b/Tools/qmake/config.tests/libwebp/libwebp.pro
@@ -1,5 +1,3 @@
 SOURCES = libwebp.cpp
 OBJECTS_DIR = obj
 LIBS += -lwebp
-
-load(qt_build_config)
diff --git a/Tools/qmake/config.tests/libzlib/libzlib.pro b/Tools/qmake/config.tests/libzlib/libzlib.pro
index 2ffc15930..648e90ed0 100644
--- a/Tools/qmake/config.tests/libzlib/libzlib.pro
+++ b/Tools/qmake/config.tests/libzlib/libzlib.pro
@@ -6,5 +6,3 @@ else {
     isEmpty(ZLIB_LIBS): LIBS += zdll.lib
     else: LIBS += $$ZLIB_LIBS
 }
-
-load(qt_build_config)
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
index 568e80a94..5c36e9313 100644
--- a/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/default_pre.prf
@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
 scratchbox: PYTHON = python2.6
 else: PYTHON = python
 
-# We use private_tests to detect developer build, since the destdir will
-# always be our webkit build dir. This might change as configure changes.
-qtConfig(private_tests): CONFIG += qt_developer_build
-
 # By default we enable "production build", and build-webkit, which is
 # used by bots and developers, will disable it, to enable warnings etc.
 CONFIG += production_build