summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-07-22 03:44:24 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-07-23 00:28:52 (GMT)
commit6238afebf272df392ae0527d127f245cfe19479b (patch)
treeebe1099fe64dbacf3382a1863fb76e11a99b626c
parentb0c5020c11913ad1de442ab0ef7e10dec225aec1 (diff)
downloadQt-6238afebf272df392ae0527d127f245cfe19479b.zip
Qt-6238afebf272df392ae0527d127f245cfe19479b.tar.gz
Qt-6238afebf272df392ae0527d127f245cfe19479b.tar.bz2
Fixed compile of Qt/symbian projects which set a custom MOC_DIR
or UI_HEADERS_DIR. This win32-specific path logic needs to get executed when the _host_ platform is win32, not the _target_. Acked-by: mstormo
-rw-r--r--mkspecs/features/moc.prf4
-rw-r--r--mkspecs/features/uic.prf6
2 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 60508c8..fdc72ca 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -1,7 +1,7 @@
#global defaults
isEmpty(QMAKE_MOC) {
- win32:QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
+ contains(QMAKE_HOST.os,Windows):QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
else:QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
}
isEmpty(MOC_DIR):MOC_DIR = .
@@ -84,7 +84,7 @@ INCREDIBUILD_XGE += moc_source
#make sure we can include these files
moc_dir_short = $$MOC_DIR
-win32: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
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf
index d2985f9..385765b 100644
--- a/mkspecs/features/uic.prf
+++ b/mkspecs/features/uic.prf
@@ -1,11 +1,11 @@
isEmpty(QMAKE_UIC3) {
- win32:QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe
+ contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe
else:QMAKE_UIC3 = $$[QT_INSTALL_BINS]/uic3
}
isEmpty(QMAKE_UIC) {
- win32:QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe
+ contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe
else:QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
}
@@ -36,7 +36,7 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_
!isEmpty(FORMS)|!isEmpty(FORMS3) {
ui_dir_short = $$UI_HEADERS_DIR
- win32: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
}