Changeset 572

Timestamp:

Feb 15, 2010, 7:53:45 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Perform hackish path substutition magic on OS/2 as well as on Win32 to make sure that generated additional include paths needed by moc and uic are correct (closes #134).

Location:

trunk/mkspecs/features

Files:

• moc.prf (modified) (1 diff)
• uic.prf (modified) (2 diffs)

trunk/mkspecs/features/moc.prf

@@ -97 +97 @@
 #make sure we can include these files
 moc_dir_short = $$MOC_DIR
-contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/,
+contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/,
 contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR
 else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR

trunk/mkspecs/features/uic.prf

@@ -37 +37 @@
 !isEmpty(FORMS)|!isEmpty(FORMS3) {
     ui_dir_short = $$UI_HEADERS_DIR
-    contains(QMAKE_HOST.os,Windows):ui_dir_short ~= s,^.:,/,
+    contains(QMAKE_HOST.os,Windows):ui_dir_short ~= s,^.:,/,
     contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR
     else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR
@@ -112 +112 @@
 image_collection.CONFIG += combine
 image_collection.name = UIC3 Image collection in ${QMAKE_FILE_OUT}
-!win32 {
+!win32 {
     image_collection.commands = $$QMAKE_UIC3 -embed $$TARGET ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     silent:image_collection.commands = @echo uic3 -embed ${QMAKE_FILE_IN} && $$image_collection.commands