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>

diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 57b89b9..6b7a2d7 100644 (file)
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -70,10 +70,6 @@ QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib
 
 QMAKE_LIBS_QT_ENTRY    = -lqtmain
 
-QMAKE_MOC              = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC              = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC              = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL              = midl
 QMAKE_LIB              = lib
 QMAKE_RC               = rc

diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf
index 441f408..0636ca7 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-641/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-641/qmake.conf
@@ -75,9 +75,6 @@ QMAKE_LIBS_DYNLOAD    =
 QMAKE_LIBS_THREAD       =
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
-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_AR               = ntox86-ar cqs
 QMAKE_RANLIB           =

diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
index bb760b2..608da69 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
@@ -78,9 +78,6 @@ QMAKE_LIBS_THREAD     =
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
 
-QMAKE_MOC              = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC              = $$[QT_INSTALL_BINS]/uic
-
 QMAKE_AR               = ar cqs
 QMAKE_RANLIB           =
 

diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
index b43c391..395f4fe 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
@@ -74,9 +74,6 @@ QMAKE_LIBS_THREAD     =
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
 
-QMAKE_MOC              = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC              = $$[QT_INSTALL_BINS]/uic
-
 QMAKE_AR               = ar cqs
 QMAKE_RANLIB           =
 

diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
index 29a2952..433b091 100644 (file)
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
@@ -74,9 +74,6 @@ QMAKE_LIBS_THREAD     =
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
 
-QMAKE_MOC              = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC              = $$[QT_INSTALL_BINS]/uic
-
 QMAKE_AR               = ar cqs
 QMAKE_RANLIB           =
 

diff --git a/mkspecs/unsupported/win32-borland/qmake.conf b/mkspecs/unsupported/win32-borland/qmake.conf
index 2ba742c..c1aa7e4 100644 (file)
--- a/mkspecs/unsupported/win32-borland/qmake.conf
+++ b/mkspecs/unsupported/win32-borland/qmake.conf
@@ -69,10 +69,6 @@ QMAKE_LIBS_QT_ENTRY  = -lqtmain
 #QMAKE_LIBS_OPENGL     =
 #QMAKE_LFLAGS_OPENGL   = /dopengl32.dll
 
-QMAKE_MOC              = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC              = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC              = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL              = midl
 QMAKE_LIB              = tlib /C /P256
 QMAKE_RC               = brcc32 -dQ_CC_BOR

diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
index 9dcff80..9c85c90 100644 (file)
--- a/mkspecs/unsupported/win32-g++-cross/qmake.conf
+++ b/mkspecs/unsupported/win32-g++-cross/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
@@ -88,12 +87,6 @@ QMAKE_DEL_DIR                = rmdir
 QMAKE_SYMBOLIC_LINK    = ln -s
 QMAKE_CHK_DIR_EXISTS   = test -d
 
-#QMAKE_IDC             = i686-pc-mingw32-idc
-QMAKE_MOC              = i686-pc-mingw32-moc
-QMAKE_RCC              = i686-pc-mingw32-rcc
-QMAKE_UIC              = i686-pc-mingw32-uic
-
-#QMAKE_IDL             = midl
 QMAKE_LIB              = i686-pc-mingw32-ar -ru
 QMAKE_RC               = i686-pc-mingw32-windres
 QMAKE_ZIP              = zip -r -9

diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index a573a4d..29681c1 100644 (file)
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -67,10 +67,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc

diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 641e410..7a04a51 100644 (file)
--- 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

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 2dd796d..8a7260a 100644 (file)
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -67,10 +67,6 @@ QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib delayimp.l
 QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
 QMAKE_LIBS_QT_ENTRY    = -lqtmain
 
-QMAKE_MOC              = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC              = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC              = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL              = midl
 QMAKE_LIB              = xilib /NOLOGO
 QMAKE_RC               = rc

diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index d4b9521..66f1023 100644 (file)
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -71,10 +71,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc

diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 00fafc7..e360165 100644 (file)
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -73,10 +73,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc

diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index b53ff1a..99645a0 100644 (file)
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -73,10 +73,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc