1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific variables

Browse Source 
Change-Id: Id410887fa97f345a229e0cbf395633ccf303fa2f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-03-05 11:49:51 +01:00 committed by Qt by Nokia
parent deea66c9f4
commit adfcd98922
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt.prf
View File

@ -189,7 +189,7 @@ for(QTLIB, QT) {
qt_compat { qt_compat {
!qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us !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 DEFINES *= QT_COMPAT
} }

2
mkspecs/features/qt_functions.prf
View File

@ -146,7 +146,7 @@ defineTest(qtAddModule) {
# to give access to sources or include files, and not for linking. # to give access to sources or include files, and not for linking.
!isEmpty(MODULE_LIBS) { !isEmpty(MODULE_LIBS) {
!isEmpty(QMAKE_LSB) { !isEmpty(QMAKE_LSB) {
QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS
QMAKE_LFLAGS *= -L/opt/lsb/lib QMAKE_LFLAGS *= -L/opt/lsb/lib
QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX} QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX}
} }

2
src/platformsupport/platformsupport.pro
View File

@ -3,7 +3,7 @@ TARGET = QtPlatformSupport
QPRO_PWD = $$PWD QPRO_PWD = $$PWD
QT += core-private gui-private QT += core-private gui-private
TEMPLATE = lib TEMPLATE = lib
DESTDIR = $$QMAKE_LIBDIR_QT DESTDIR = $$QT.gui.libs
CONFIG += module CONFIG += module
CONFIG += staticlib CONFIG += staticlib

4
src/winmain/winmain.pro
View File

@ -11,11 +11,11 @@ win32 {
win32-borland:DEFINES += QT_NEEDS_QMAIN win32-borland:DEFINES += QT_NEEDS_QMAIN
SOURCES = qtmain_win.cpp SOURCES = qtmain_win.cpp
CONFIG += png CONFIG += png
INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore INCLUDEPATH += tmp $$QT.core.includes
} }
!win32:error("$$_FILE_ is intended only for Windows!") !win32:error("$$_FILE_ is intended only for Windows!")
load(qt_module_config) load(qt_module_config)
DESTDIR = $$QMAKE_LIBDIR_QT DESTDIR = $$QT.core.libs
wince*:QMAKE_POST_LINK = wince*:QMAKE_POST_LINK =