diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-27 17:50:33 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-27 17:50:33 (GMT) |
| commit | 0ebf7aad380ad09475f3d19264f031d0f2ec2d55 (patch) | |
| tree | d0128e3842bae6e03b1de797d858b25e6389abe4 /mkspecs/features | |
| parent | 749745e0a1b099cf08b085da0ec063485724df11 (diff) | |
| download | Qt-0ebf7aad380ad09475f3d19264f031d0f2ec2d55.zip Qt-0ebf7aad380ad09475f3d19264f031d0f2ec2d55.tar.gz Qt-0ebf7aad380ad09475f3d19264f031d0f2ec2d55.tar.bz2 | |
Revert "make shadow builds work even if a non-shadow build is present"
This reverts commit 3aff9113a9702ea6f7e099a73136a718ae1b992f.
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 5e09455..faa9871 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 += $$OUT_PWD/$$MOC_DIR +INCLUDEPATH += $$MOC_DIR #auto depend on moc unix:!no_mocdepend { diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 8077954..885fad7 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 += $$OUT_PWD/$$UI_HEADERS_DIR +INCLUDEPATH += $$UI_HEADERS_DIR uic3 { isEmpty(FORMS3) { |