From adfcd9892266812596d0b19c72d38248e3ebf3b1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 5 Mar 2012 11:49:51 +0100 Subject: replace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific variables Change-Id: Id410887fa97f345a229e0cbf395633ccf303fa2f Reviewed-by: Joerg Bornemann --- src/platformsupport/platformsupport.pro | 2 +- src/winmain/winmain.pro | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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 = -- cgit v1.2.3