Changeset 1029

Timestamp:

Aug 26, 2011, 1:51:43 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

mkspecs/os2: Better replacement for r1025.

The original change breaks the build.

Location:

trunk/mkspecs/features/os2

Files:

• default_post.prf (modified) (1 diff)
• exepack.prf (modified) (1 diff)
• highmem.prf (modified) (1 diff)
• map.prf (modified) (1 diff)
• sym.prf (modified) (1 diff)

trunk/mkspecs/features/os2/default_post.prf

@@ -1 @@
-contains(TEMPLATE, ".*app"):CONFIG += exe_or_dll
-contains(TEMPLATE, ".*lib"):dll:CONFIG += exe_or_dll
-
 !CONFIG(windows):!CONFIG(console) {
     CONFIG(release, debug|release):CONFIG(qt):contains(QT, gui) {

trunk/mkspecs/features/os2/exepack.prf

@@ -1 +1 @@
 isEmpty(QMAKE_EXEPACK):error("'exepack' is present in CONFIG but QMAKE_EXEPACK is not defined!")
 
-exe_or_dll { 
+contains(TEMPLATE, ".*lib"):dll|contains(TEMPLATE, ".*app") { 
     build_pass|isEmpty(BUILDS) {
         CONFIG(release, debug|release) {
-            !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK += $$escape_expand(\\n\\t)
-            QMAKE_POST_LINK += $$QMAKE_EXEPACK $$QMAKE_EXEPACK_FLAGS $@ $$QMAKE_EXEPACK_POST_FLAGS
+            !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)
+            QMAKE_POST_LINK = $$QMAKE_POST_LINK$$QMAKE_EXEPACK $$QMAKE_EXEPACK_FLAGS $@ $$QMAKE_EXEPACK_POST_FLAGS
         }
     }

trunk/mkspecs/features/os2/highmem.prf

@@ -1 @@
-exe_or_dll {
+contains(TEMPLATE, ".*lib"):dll|contains(TEMPLATE, ".*app") { 
     build_pass|isEmpty(BUILDS) {
         QMAKE_LFLAGS += $$QMAKE_LFLAGS_HIGHMEM

trunk/mkspecs/features/os2/map.prf

@@ -1 @@
-exe_or_dll { 
+contains(TEMPLATE, ".*lib"):dll|contains(TEMPLATE, ".*app") { 
     build_pass|isEmpty(BUILDS) {
         QMAKE_LFLAGS += $$QMAKE_LFLAGS_MAP

trunk/mkspecs/features/os2/sym.prf

@@ -1 +1 @@
 isEmpty(QMAKE_MAPSYM):error("'sym' is present in CONFIG but QMAKE_MAPSYM is not defined!")
 
-exe_or_dll { 
+contains(TEMPLATE, ".*lib"):dll|contains(TEMPLATE, ".*app") { 
     build_pass|isEmpty(BUILDS) {
-        !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n)
+        QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n)
         QMAKE_POST_LINK = $$QMAKE_POST_LINK$$QMAKE_IFNDEF FAST_BUILD$$escape_expand(\\n\\t)
         QMAKE_POST_LINK = $$QMAKE_POST_LINK$$QMAKE_RUN_MAPSYM