clean up visual studio identification code

TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is
used.

Reviewed-by: mariusSO

12 files changed, 16 insertions, 22 deletions

diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf
index a81a0ccde1..97ccc44066 100644
--- a/mkspecs/features/incredibuild_xge.prf
+++ b/mkspecs/features/incredibuild_xge.prf
@@ -1,4 +1,4 @@
-contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc") {
+contains(TEMPLATE, "vc.*") {
     EOC = $$escape_expand(\\n\\t)
 
     # The VCPROJ generator will replace the \r\h with the coded \r\n: 

diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 89e9b40a2f..d0b36e41b2 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -16,7 +16,7 @@ win32:count($$list($$INCLUDEPATH), 40, >) {
 
     EOC = $$escape_expand(\\n\\t)
 
-    if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
+    contains(TEMPLATE, "vc.*") {
         # the VCPROJ generator will replace the \r\h with the coded \r\n: 

         # No other generator understands the \h
         if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\\r\\h)
@@ -42,7 +42,7 @@ win32:count($$list($$INCLUDEPATH), 40, >) {
 defineReplace(mocCmdBase) {
     !isEmpty(WIN_INCLUDETEMP) {
         RET =
-        if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
+        contains(TEMPLATE, "vc.*") {
             RET += $$mocinclude.commands
         }
         RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D)
@@ -59,7 +59,7 @@ moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAK
 moc_header.input = HEADERS
 moc_header.variable_out = SOURCES
 moc_header.name = MOC ${QMAKE_FILE_IN}
-if(!contains(TEMPLATE, "vc.*"):!contains(TEMPLATE_PREFIX, "vc")) {
+!contains(TEMPLATE, "vc.*") {
 	!isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP
 }
 silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands
@@ -73,7 +73,7 @@ moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_
 moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC}
 moc_source.input = SOURCES OBJECTIVE_SOURCES
 moc_source.name = MOC ${QMAKE_FILE_IN}
-if(!contains(TEMPLATE, "vc.*"):!contains(TEMPLATE_PREFIX, "vc")) {
+!contains(TEMPLATE, "vc.*") {
 	!isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP
 }
 silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands
diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf
index 69c9d1d3d0..5545a62c45 100644
--- a/mkspecs/features/win32/embed_manifest_dll.prf
+++ b/mkspecs/features/win32/embed_manifest_dll.prf
@@ -1,4 +1,4 @@
-!if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
+!if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:equals(TEMPLATE, "lib") {
     MANIFEST_DIR = $$OBJECTS_DIR
     isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
     NOPATH_TARGET = $$TARGET
diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf
index 44aadfa15a..c6d012e55c 100644
--- a/mkspecs/features/win32/embed_manifest_exe.prf
+++ b/mkspecs/features/win32/embed_manifest_exe.prf
@@ -1,4 +1,4 @@
-if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
+if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):equals(TEMPLATE, "app") {
     MANIFEST_DIR = $$OBJECTS_DIR
     isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
     NOPATH_TARGET = $$TARGET
diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/qaxserver.prf
index 2899976644..a6c0869540 100644
--- a/mkspecs/features/win32/qaxserver.prf
+++ b/mkspecs/features/win32/qaxserver.prf
@@ -8,12 +8,7 @@ isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0
 
 DEFINES += QAXSERVER
 
-ACTIVEQT_IDE = makefile
-equals(TEMPLATE_PREFIX, "vc"):ACTIVEQT_IDE = VisualStudio
-equals(TEMPLATE, "vcapp"):ACTIVEQT_IDE = VisualStudio
-equals(TEMPLATE, "vclib"):ACTIVEQT_IDE = VisualStudio
-
-equals(ACTIVEQT_IDE, "VisualStudio") {
+contains(TEMPLATE, "vc.*") {
     ACTIVEQT_IDC = $${QMAKE_IDC}   ### Qt5: remove me
     qtPrepareTool(ACTIVEQT_IDC, idc)
     ACTIVEQT_IDL = $${QMAKE_IDL}
@@ -27,8 +22,7 @@ equals(ACTIVEQT_IDE, "VisualStudio") {
     }
     ACTIVEQT_TLBOUT = "$(TargetDir)/$${TARGET}.tlb"
     GENERATED += $${OBJECTS_DIR}/$${TARGET}.idl $${ACTIVEQT_TLBOUT}
-}
-equals(ACTIVEQT_IDE, "makefile") {
+} else {
     ACTIVEQT_IDC = -$(IDC)
     ACTIVEQT_IDL = -$(IDL)
     ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t)
diff --git a/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf b/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
index 3dab72ae80..900d758cc3 100644
--- a/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
+++ b/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
@@ -1,6 +1,6 @@
 # Visual Studio has some definitions set internally.
 # Thus we do not need to redefine these.
-if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+equals(TEMPLATE, "vc.*") {
     DEFINES -= _M_ARM
     QMAKE_CXXFLAGS += -fp:precise
 }
diff --git a/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf b/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf
index d3e49aba08..4dbcf35d6c 100644
--- a/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf
+++ b/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf
@@ -1,6 +1,6 @@
 # Visual Studio has some definitions set internally.
 # Thus we do not need to redefine these.
-if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+contains(TEMPLATE, "vc.*") {
     DEFINES -= _M_MRX000=3000
     QMAKE_CXXFLAGS += -fp:precise
 }
diff --git a/mkspecs/wince50standard-x86-msvc2005/default_post.prf b/mkspecs/wince50standard-x86-msvc2005/default_post.prf
index 6790c60695..2436efb207 100644
--- a/mkspecs/wince50standard-x86-msvc2005/default_post.prf
+++ b/mkspecs/wince50standard-x86-msvc2005/default_post.prf
@@ -1,6 +1,6 @@
 # Visual Studio has some definitions set internally.
 # Thus we do not need to redefine these.
-if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+equals(TEMPLATE, "vc.*") {
     QMAKE_CXXFLAGS += -fp:precise
 }
 
diff --git a/mkspecs/wincewm50pocket-msvc2005/default_post.prf b/mkspecs/wincewm50pocket-msvc2005/default_post.prf
index 3dab72ae80..84ea15e095 100644
--- a/mkspecs/wincewm50pocket-msvc2005/default_post.prf
+++ b/mkspecs/wincewm50pocket-msvc2005/default_post.prf
@@ -1,6 +1,6 @@
 # Visual Studio has some definitions set internally.
 # Thus we do not need to redefine these.
-if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+contains(TEMPLATE, "vc.*") {
     DEFINES -= _M_ARM
     QMAKE_CXXFLAGS += -fp:precise
 }
diff --git a/mkspecs/wincewm50smart-msvc2005/default_post.prf b/mkspecs/wincewm50smart-msvc2005/default_post.prf
index 3dab72ae80..84ea15e095 100644
--- a/mkspecs/wincewm50smart-msvc2005/default_post.prf
+++ b/mkspecs/wincewm50smart-msvc2005/default_post.prf
@@ -1,6 +1,6 @@
 # Visual Studio has some definitions set internally.
 # Thus we do not need to redefine these.
-if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+contains(TEMPLATE, "vc.*") {
     DEFINES -= _M_ARM
     QMAKE_CXXFLAGS += -fp:precise
 }
diff --git a/mkspecs/wincewm60professional-msvc2005/default_post.prf b/mkspecs/wincewm60professional-msvc2005/default_post.prf
index 3dab72ae80..84ea15e095 100644
--- a/mkspecs/wincewm60professional-msvc2005/default_post.prf
+++ b/mkspecs/wincewm60professional-msvc2005/default_post.prf
@@ -1,6 +1,6 @@
 # Visual Studio has some definitions set internally.
 # Thus we do not need to redefine these.
-if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+contains(TEMPLATE, "vc.*") {
     DEFINES -= _M_ARM
     QMAKE_CXXFLAGS += -fp:precise
 }
diff --git a/mkspecs/wincewm60standard-msvc2005/default_post.prf b/mkspecs/wincewm60standard-msvc2005/default_post.prf
index 3dab72ae80..84ea15e095 100644
--- a/mkspecs/wincewm60standard-msvc2005/default_post.prf
+++ b/mkspecs/wincewm60standard-msvc2005/default_post.prf
@@ -1,6 +1,6 @@
 # Visual Studio has some definitions set internally.
 # Thus we do not need to redefine these.
-if(equals(TEMPLATE_PREFIX, "vc") | equals(TEMPLATE, "vc*")) {
+contains(TEMPLATE, "vc.*") {
     DEFINES -= _M_ARM
     QMAKE_CXXFLAGS += -fp:precise
 }