diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 19:57:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 20:01:42 +0100 |
| commit | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (patch) | |
| tree | 71e777ca1e33c58edd9149821e970495ef4b75b2 /mkspecs/features/qmake_use.prf | |
| parent | e6234535929c67e7fbfa1ad7ce88f37df0b68d45 (diff) | |
| parent | 4d3781b640e8fb0a04e96b2d05199247556b8d86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
mkspecs/features/moc.prf
Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b
Diffstat (limited to 'mkspecs/features/qmake_use.prf')
| -rw-r--r-- | mkspecs/features/qmake_use.prf | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf index 9b6c67ccc2..f81d1cece4 100644 --- a/mkspecs/features/qmake_use.prf +++ b/mkspecs/features/qmake_use.prf @@ -5,25 +5,19 @@ for(ever) { use = $$split(use, /) name = $$take_first(use) nu = $$upper($$name) - debug: \ - libs = $$eval(QMAKE_LIBS_$${nu}_DEBUG) - else: \ - libs = $$eval(QMAKE_LIBS_$${nu}_RELEASE) - libs += $$eval(QMAKE_LIBS_$$nu) - libdir = $$eval(QMAKE_LIBDIR_$$nu) - defines = $$eval(QMAKE_DEFINES_$${nu}) - includes = $$eval(QMAKE_INCDIR_$${nu}) - - isEmpty(libs):isEmpty(defines):isEmpty(includes): \ + !defined(QMAKE_LIBS_$$nu, var): \ error("Library '$$name' is not defined.") !contains(use, nolink) { - QMAKE_LIBDIR += $$libdir - LIBS$${suffix} += $$libs + QMAKE_LIBDIR += $$eval(QMAKE_LIBDIR_$$nu) + debug: \ + LIBS$${suffix} += $$eval(QMAKE_LIBS_$${nu}_DEBUG) $$eval(QMAKE_LIBS_$$nu) + else: \ + LIBS$${suffix} += $$eval(QMAKE_LIBS_$${nu}_RELEASE) $$eval(QMAKE_LIBS_$$nu) } !contains(use, linkonly) { - DEFINES += $$defines - INCLUDEPATH += $$includes + DEFINES += $$eval(QMAKE_DEFINES_$${nu}) + INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu}) } } !isEmpty(suffix): break() |