diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-07-23 11:57:39 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-07-23 11:57:39 (GMT) |
| commit | cf66c667a97c0079141eb3f2d9e997b7378ae792 (patch) | |
| tree | 12fa0a18be08b07ab8675a6317c5f89d1f6778d3 /mkspecs | |
| parent | c7a431ff7f51b1ccd4b0f2a6b3766e1e67f92e4e (diff) | |
| parent | 6238afebf272df392ae0527d127f245cfe19479b (diff) | |
| download | Qt-cf66c667a97c0079141eb3f2d9e997b7378ae792.zip Qt-cf66c667a97c0079141eb3f2d9e997b7378ae792.tar.gz Qt-cf66c667a97c0079141eb3f2d9e997b7378ae792.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/moc.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 6 |
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 } |