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 /src | |
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 'src')
-rw-r--r-- | src/platformsupport/platformsupport.pro | 2 | ||||
-rw-r--r-- | src/winmain/winmain.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 8322d4c70f..47618f02e3 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -3,7 +3,7 @@ TARGET = QtPlatformSupport QPRO_PWD = $$PWD QT += core-private gui-private TEMPLATE = lib -DESTDIR = $$QMAKE_LIBDIR_QT +DESTDIR = $$QT.gui.libs CONFIG += module CONFIG += staticlib diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 6630d86326..04a3756bb5 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -11,11 +11,11 @@ win32 { win32-borland:DEFINES += QT_NEEDS_QMAIN SOURCES = qtmain_win.cpp CONFIG += png - INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore + INCLUDEPATH += tmp $$QT.core.includes } !win32:error("$$_FILE_ is intended only for Windows!") load(qt_module_config) -DESTDIR = $$QMAKE_LIBDIR_QT +DESTDIR = $$QT.core.libs wince*:QMAKE_POST_LINK = |