Changeset 593

Timestamp:

Feb 23, 2010, 1:15:02 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: features/os2: splitDll: Take FORMS and RESOURCES into the split since they affect source file list too. This fixes periodical build errors due to duplicate symbols in qrc_ and .cpp files or missing moc_ targets.

File:

• trunk/mkspecs/features/os2/default_pre.prf (modified) (3 diffs)

trunk/mkspecs/features/os2/default_pre.prf

@@ -150 +150 @@
             eval($${scope}_SOURCES = $$SOURCES)
             export($${scope}_SOURCES)
+            eval($${scope}_FORMS = $$FORMS)
+            export($${scope}_FORMS)
+            eval($${scope}_RESOURCES = $$RESOURCES)
+            export($${scope}_RESOURCES)
         }
 
@@ -156 +160 @@
         unset(SOURCES)
         export(SOURCES)
+        unset(FORMS)
+        export(FORMS)
+        unset(RESOURCES)
+        export(RESOURCES)
     }
 }
@@ -177 +185 @@
         CONFIG($$SPLIT_CONFIG):CONFIG($$scope) {
             eval(HEADERS = $$eval($${scope}_HEADERS))
+            export(HEADERS)
             eval(SOURCES = $$eval($${scope}_SOURCES))
-            export(HEADERS)
             export(SOURCES)
+            eval(FORMS = $$eval($${scope}_FORMS))
+            export(FORMS)
+            eval(RESOURCES = $$eval($${scope}_RESOURCES))
+            export(RESOURCES)
         }
     }