summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-g++
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-03-09 17:15:26 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-09 18:50:52 +0100
commit65ebf592ba0f0e0654162620a92c9a22af0534ab (patch)
tree8b0c1a7906794a8a0f0da3b281ea02194b285035 /mkspecs/win32-g++
parentf16b08dfc641437ed53765b5de45911ba38d7410 (diff)
remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2)
Follow-up to d13bedb9d8fb66f58ba901864555bcc9b6e463e0 where the regexp was a bit too tight and missed many specs. Also cleaned up QMAKE_IDC, QMAKE_RCC and QMAKE_IDL. Change-Id: Ia15007141739019ef5ccfdda0c856c478f732b85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/win32-g++')
-rw-r--r--mkspecs/win32-g++/qmake.conf5
1 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 641e4109ff..7a04a51932 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -65,7 +65,6 @@ QMAKE_LINK_OBJECT_SCRIPT= object_script
QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
-
QMAKE_LIBS =
QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
@@ -96,10 +95,6 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
QMAKE_CHK_DIR_EXISTS = if not exist
}
-QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
-
QMAKE_IDL = midl
QMAKE_LIB = ar -ru
QMAKE_RC = windres