diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-18 14:46:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-22 07:45:52 +0000 |
| commit | 4f2a571f0969eec6178e0bc8723b60cc05443d20 (patch) | |
| tree | 0256ebeed44667e948b1c389954d1abacb47c6ee /mkspecs/features/qt_helper_lib.prf | |
| parent | 980daa49b207127bd3bb7cb41bd6d9df93827caa (diff) | |
fix usage of "empty" libraries
a header-only library in a default location would produce no variables
at all, making it appear undefined. fix this by forcing the writeout of
the QMAKE_LIBS_* variable, and use its definedness (rather than
non-emptiness) as a signifier.
this works for both QMAKE_USE and configure tests'/libraries' 'use'
entries.
Change-Id: Id7a1e23725caba1a91ea4db448b4aeb7fe632393
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/features/qt_helper_lib.prf')
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 99ba0c6877..b3e49e4626 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -42,6 +42,7 @@ THE_TARGET = $$qt5LibraryTarget($$TARGET) darwin: MODULE_DEBUG_LIBS = -L$$DESTDIR -l$${TARGET}_debug MODULE_RELEASE_LIBS = -L$$DESTDIR -l$$TARGET MODULE_PRI_CONT += \ + "QMAKE_LIBS_$${ucmodule} =" \ # Needed for the module to be recognized. "QMAKE_LIBS_$${ucmodule}_DEBUG = $$val_escape(MODULE_DEBUG_LIBS)" \ "QMAKE_LIBS_$${ucmodule}_RELEASE = $$val_escape(MODULE_RELEASE_LIBS)" } else { |