diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-03-26 19:06:22 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-03-27 11:10:31 (GMT) |
| commit | 3aff9113a9702ea6f7e099a73136a718ae1b992f (patch) | |
| tree | 4e8041b6f32f3c457839ab1cdf99873d0377c10e /mkspecs/features | |
| parent | aeb5fd46c7a4427ba13d9d75947006dee5fb0a20 (diff) | |
| download | Qt-3aff9113a9702ea6f7e099a73136a718ae1b992f.zip Qt-3aff9113a9702ea6f7e099a73136a718ae1b992f.tar.gz Qt-3aff9113a9702ea6f7e099a73136a718ae1b992f.tar.bz2 | |
make shadow builds work even if a non-shadow build is present
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/moc.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index faa9871..5e09455 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -61,7 +61,7 @@ QMAKE_EXTRA_COMPILERS += moc_source INCREDIBUILD_XGE += moc_source #make sure we can include these files -INCLUDEPATH += $$MOC_DIR +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..8077954 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -34,7 +34,7 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ INCREDIBUILD_XGE += uic } -INCLUDEPATH += $$UI_HEADERS_DIR +INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR uic3 { isEmpty(FORMS3) { |