diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-05 11:49:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 18:57:56 +0100 |
commit | adfcd9892266812596d0b19c72d38248e3ebf3b1 (patch) | |
tree | e48ba1d2dca7e6bfeb16248be3c2d80fd0b4377b /mkspecs | |
parent | deea66c9f43c0a71d1f6387d7d4d59edeae79648 (diff) |
replace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific variables
Change-Id: Id410887fa97f345a229e0cbf395633ccf303fa2f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_functions.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 21443aa5b5..f5ee74cf86 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -189,7 +189,7 @@ for(QTLIB, QT) { qt_compat { !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us - INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt + INCLUDEPATH *= $$QT.core.includes DEFINES *= QT_COMPAT } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 31b28156e8..370187b722 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -146,7 +146,7 @@ defineTest(qtAddModule) { # to give access to sources or include files, and not for linking. !isEmpty(MODULE_LIBS) { !isEmpty(QMAKE_LSB) { - QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT + QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS QMAKE_LFLAGS *= -L/opt/lsb/lib QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX} } |