From 0ebf7aad380ad09475f3d19264f031d0f2ec2d55 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 27 Mar 2009 18:50:33 +0100 Subject: Revert "make shadow builds work even if a non-shadow build is present" This reverts commit 3aff9113a9702ea6f7e099a73136a718ae1b992f. --- mkspecs/features/moc.prf | 2 +- 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) { -- cgit v0.12