Changeset 846 for trunk/mkspecs/features/win32

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• mkspecs/features/win32/embed_manifest_dll.prf (modified) (1 diff)
• mkspecs/features/win32/embed_manifest_exe.prf (modified) (1 diff)
• mkspecs/features/win32/msvc_mp.prf (copied) (copied from branches/vendor/nokia/qt/4.7.2/mkspecs/features/win32/msvc_mp.prf )
• mkspecs/features/win32/qaxserver.prf (modified) (2 diffs)
• mkspecs/features/win32/thread.prf (modified) (1 diff)

trunk/mkspecs/features/win32/embed_manifest_dll.prf

@@ -1 +1 @@
 MANIFEST_DIR = $$OBJECTS_DIR
 isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
-!if(plugin:no_plugin_manifest):if(win32-msvc2005|win32-msvc2008):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
+!if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
     NOPATH_TARGET = $$TARGET
-    NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
-    NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
+    NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
+    NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators
     NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths
     QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")
-    QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK
-    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\n\t))
-    QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
+    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
+    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\\n\\t))$$QMAKE_POST_LINK
     QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
 }

trunk/mkspecs/features/win32/embed_manifest_exe.prf

@@ -1 +1 @@
 MANIFEST_DIR = $$OBJECTS_DIR
 isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
-if(win32-msvc2005|win32-msvc2008):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
+if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
     NOPATH_TARGET = $$TARGET
-    NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
-    NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
+    NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
+    NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators
     NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths
     QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")
-    QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK
-    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\n\t))
-    QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
+    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
+    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t))$$QMAKE_POST_LINK
     QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
 }

trunk/mkspecs/features/win32/qaxserver.prf

@@ -20 +20 @@
     ACTIVEQT_TARGET = "$(TargetPath)"
     win32-msvc {
-        ACTIVEQT_NEWLINE = $$escape_expand(\t)
+        ACTIVEQT_NEWLINE = $$escape_expand(\\t)
         ACTIVEQT_OUTPUT = $(IntDir)/$${TARGET}
     } else {
-        ACTIVEQT_NEWLINE = $$escape_expand(\n\t)
+        ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t)
         ACTIVEQT_OUTPUT = $(IntDir)$${TARGET}
     }
@@ -32 +32 @@
     ACTIVEQT_IDC = -$(IDC)
     ACTIVEQT_IDL = -$(IDL)
-    ACTIVEQT_NEWLINE = $$escape_expand(\n\t)
+    ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t)
     ACTIVEQT_TARGET = $(DESTDIR_TARGET)
     ACTIVEQT_OUTPUT = $(OBJECTS_DIR)/$${TARGET}

trunk/mkspecs/features/win32/thread.prf

@@ -24 +24 @@
 }
 
-win32-msvc|win32-msvc.net {
-  !contains(DEFINES, QT_DLL):!target_qt:!isEqual(TARGET, qtmain):QMAKE_LFLAGS += /NODEFAULTLIB:"libc"
-}
-
 QMAKE_LIBS += $$QMAKE_LIBS_RTMT