From 7ae27514e4a800eb0419879dc38cfdfce897ad60 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 5 Dec 2016 12:14:32 +0100 Subject: make sure the configure system loads qt_build_config.prf otherwise it won't have access to private features like private_tests. doing it centrally also makes it unnecessary to explicitly load() it from the configure testcases themselves. Task-number: QTBUG-57431 Change-Id: I025b01f37265e90c7611e2af939ca83ac13049d2 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Thiago Macieira --- Tools/qmake/.qmake.conf | 3 +++ Tools/qmake/config.tests/icu/icu.pro | 2 -- Tools/qmake/config.tests/leveldb/leveldb.pro | 2 -- Tools/qmake/config.tests/libsqlite3/libsqlite3.pro | 2 -- Tools/qmake/config.tests/libwebp/libwebp.pro | 2 -- Tools/qmake/config.tests/libzlib/libzlib.pro | 2 -- 6 files changed, 3 insertions(+), 10 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) -- cgit v1.2.1 From 74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Wed, 14 Sep 2016 23:51:14 +0200 Subject: Remove unused check for private_tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It turns out that qt_developer_build is never used anyway. I did some git archeology and it looks like it was nuked when doing the 5.2 merge from upstream. The original purpose was apparently to control -Werror, which is nowadays controlled by CONFIG -= production_build. This actually fixes the build, as the QT_FOR_CONFIG += core-private which would have been required for qtConfig(private_tests) is missing. Task-number: QTBUG-55950 Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3 Reviewed-by: Oswald Buddenhagen Reviewed-by: Konstantin Tokarev Reviewed-by: Jan Kundrát --- Tools/qmake/mkspecs/features/default_pre.prf | 4 ---- 1 file changed, 4 deletions(-) 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 -- cgit v1.2.1