diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-07 17:02:56 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-13 15:53:57 +0200 |
| commit | 02f477c73da492c0fc85a2e0fccde2384f4611da (patch) | |
| tree | 8bd320293e38ad98cdd88ed5c2c320ec7924c9f7 | |
| parent | f384f80057d0648692a01ae034ec27d56b455010 (diff) | |
| download | qtwebkit-02f477c73da492c0fc85a2e0fccde2384f4611da.tar.gz | |
Load flags used by Qt modules when compile testing for a module
In order to pick-up the include path and library path passed
to Qt configure, the configure tests needs to load the Qt
build config.
Change-Id: I881d5e87a08bf8dab5058802dc80ca58d0eed5b1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -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/libwebp/libwebp.pro | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Tools/qmake/config.tests/icu/icu.pro b/Tools/qmake/config.tests/icu/icu.pro index 16267ff82..66346e4d5 100644 --- a/Tools/qmake/config.tests/icu/icu.pro +++ b/Tools/qmake/config.tests/icu/icu.pro @@ -15,3 +15,5 @@ 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 2d64eeba9..f28cfd155 100644 --- a/Tools/qmake/config.tests/leveldb/leveldb.pro +++ b/Tools/qmake/config.tests/leveldb/leveldb.pro @@ -1,3 +1,5 @@ SOURCES = leveldb.cpp OBJECTS_DIR = obj LIBS += -lleveldb -lmemenv + +load(qt_build_config) diff --git a/Tools/qmake/config.tests/libwebp/libwebp.pro b/Tools/qmake/config.tests/libwebp/libwebp.pro index 925725270..700c44df6 100644 --- a/Tools/qmake/config.tests/libwebp/libwebp.pro +++ b/Tools/qmake/config.tests/libwebp/libwebp.pro @@ -1,3 +1,5 @@ SOURCES = libwebp.cpp OBJECTS_DIR = obj LIBS += -lwebp + +load(qt_build_config) |