diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-03-31 12:38:57 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 16:01:53 (GMT) |
| commit | 33fedde08f263c6aaa46c2fa0fdf93896c7eaa64 (patch) | |
| tree | d81038332ea3753960560a055bd6344bccd9e964 | |
| parent | 3570e978058816745101a69b552ad9d07e349542 (diff) | |
| download | Qt-33fedde08f263c6aaa46c2fa0fdf93896c7eaa64.zip Qt-33fedde08f263c6aaa46c2fa0fdf93896c7eaa64.tar.gz Qt-33fedde08f263c6aaa46c2fa0fdf93896c7eaa64.tar.bz2 | |
re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992f
this time, it can deal with directories which are absolute to start
with.
Reviewed-by: mariusSO
| -rw-r--r-- | mkspecs/features/moc.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index faa9871..d3ad4b2 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -61,7 +61,10 @@ QMAKE_EXTRA_COMPILERS += moc_source INCREDIBUILD_XGE += moc_source #make sure we can include these files -INCLUDEPATH += $$MOC_DIR +moc_dir_short = $$MOC_DIR +win32:moc_dir_short ~= s,^.:,/, +contains(moc_dir_short, ^[/\\].*):INCLUDEPATH += $$MOC_DIR +else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR #auto depend on moc unix:!no_mocdepend { diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 885fad7..f03d623 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -34,7 +34,10 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ INCREDIBUILD_XGE += uic } -INCLUDEPATH += $$UI_HEADERS_DIR +ui_dir_short = $$UI_HEADERS_DIR +win32:ui_dir_short ~= s,^.:,/, +contains(ui_dir_short, ^[/\\].*):INCLUDEPATH += $$UI_HEADERS_DIR +else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR uic3 { isEmpty(FORMS3) { |