Changeset 594

Timestamp:

Feb 23, 2010, 2:34:49 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Fixed: On debug_and_release platforms, qrc output files were searched in the wrong output directory while determining the list of include dependencies which resulted into a compile rule for the qrc in the right output directory file even if this file is actually included from the main source file which eventually resulted in duplicate symbols when linking [vendor bug].

Location:

trunk

Files:

• mkspecs/features/exclusive_builds.prf (modified) (1 diff)
• mkspecs/features/resources.prf (modified) (1 diff)
• src/qbase.pri (modified) (1 diff)

trunk/mkspecs/features/exclusive_builds.prf

@@ -10 +10 @@
     else:appendFirstBuild = true
 
-    isEmpty(QMAKE_DIR_REPLACE):QMAKE_DIR_REPLACE += OBJECTS_DIR MOC_DIR RCC_DIR
+    QMAKE_DIR_REPLACE *= OBJECTS_DIR MOC_DIR RCC_DIR UI_DIR PRECOMPILED_DIR
     lessThan(firstBuild, $$secondBuild):eval($${firstBuild}_and_$${secondBuild}_target:QMAKE_DIR_REPLACE += DESTDIR)
     else:eval($${secondBuild}_and_$${firstBuild}_target:QMAKE_DIR_REPLACE += DESTDIR)

trunk/mkspecs/features/resources.prf

@@ -7 +7 @@
 isEmpty(QMAKE_RESOURCE_PREFIX):QMAKE_RESOURCE_PREFIX = /tmp/
 isEmpty(QMAKE_MOD_RCC):QMAKE_MOD_RCC = qrc
+
+#make sure we can include these files
+rcc_dir_short = $$RCC_DIR
+contains(QMAKE_HOST.os,Windows)|os2:rcc_dir_short ~= s,^.:,/,
+contains(rcc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$RCC_DIR
+else:INCLUDEPATH += $$OUT_PWD/$$RCC_DIR
 
 resource_combine {

trunk/src/qbase.pri

@@ -1 +1 @@
 isEmpty(TARGET):error(You must set TARGET before include()'ing $${_FILE_})
 INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat
-!isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR
 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
 TEMPLATE        = lib