diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-10 19:34:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 23:06:25 +0200 |
| commit | a15d6744068b4d0bb4c033eb2c9897e1e251fdca (patch) | |
| tree | 0f312048d34b2de0cdeb025e991f33b06aea41f0 /mkspecs | |
| parent | 9d1f44b9ce61ae42eccf92d24d5eda437ecad05e (diff) | |
fix linking against installations in /usr/lib
Change-Id: I17a6a2e058f039e525461d459477329fd7090417
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index ee5acbcfa7..1868c68a69 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -98,9 +98,9 @@ defineTest(qtAddModule) { } # Only link to this module if a libs directory is set, else this is just a module # to give access to sources or include files, and not for linking. - !isEmpty(MODULE_LIBS) { + !isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works !isEmpty(QMAKE_LSB) { - QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS + !isEmpty(MODULE_LIBS): QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS QMAKE_LFLAGS *= -L/opt/lsb/lib QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX} } |