diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-05 12:14:32 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-10 16:32:20 +0000 |
| commit | 7ae27514e4a800eb0419879dc38cfdfce897ad60 (patch) | |
| tree | 2717776a1eca90151b488044c9e2aaec8ee0699f | |
| parent | 67fef93059ba23812d7390ec7bb8d70f8e7b0492 (diff) | |
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 <allan.jensen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | Tools/qmake/.qmake.conf | 3 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/icu/icu.pro | 2 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/leveldb/leveldb.pro | 2 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libsqlite3/libsqlite3.pro | 2 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libwebp/libwebp.pro | 2 | ||||
| -rw-r--r-- | 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) |