diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-03-09 17:15:26 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-09 18:50:52 +0100 |
| commit | 65ebf592ba0f0e0654162620a92c9a22af0534ab (patch) | |
| tree | 8b0c1a7906794a8a0f0da3b281ea02194b285035 /mkspecs/unsupported | |
| parent | f16b08dfc641437ed53765b5de45911ba38d7410 (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/unsupported')
| -rw-r--r-- | mkspecs/unsupported/qws/qnx-641/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/win32-borland/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 7 | ||||
| -rw-r--r-- | mkspecs/unsupported/win32-msvc2003/qmake.conf | 4 |
7 files changed, 0 insertions, 27 deletions
diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf index 441f408802..0636ca7347 100644 --- 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 bb760b24a7..608da6948e 100644 --- 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 b43c39143f..395f4fe3bf 100644 --- 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 29a2952989..433b09161f 100644 --- 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 2ba742c104..c1aa7e46ad 100644 --- 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 9dcff807fa..9c85c9033c 100644 --- 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 a573a4dd8c..29681c1034 100644 --- 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 |