summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-15 14:16:28 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-20 11:02:56 (GMT)
commitcc8f9a20198590d219fe38421d0629002e574c20 (patch)
tree723851c72fd39b26318abd796f79f165bdd16c16
parent2e3f7621d696bec6173810c75b042249645fa714 (diff)
downloadQt-cc8f9a20198590d219fe38421d0629002e574c20.zip
Qt-cc8f9a20198590d219fe38421d0629002e574c20.tar.gz
Qt-cc8f9a20198590d219fe38421d0629002e574c20.tar.bz2
do not add UI_DIR to INCLUDEPATH if no FORMS are used
Reviewed-by: mariusSO
-rw-r--r--mkspecs/features/uic.prf10
1 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf
index 0c7fb1b..d2985f9 100644
--- a/mkspecs/features/uic.prf
+++ b/mkspecs/features/uic.prf
@@ -34,10 +34,12 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_
INCREDIBUILD_XGE += uic
}
-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
+!isEmpty(FORMS)|!isEmpty(FORMS3) {
+ 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
+}
# Backwards compatibility: Make shadow builds with default UI_DIR work
# if the user did not add the source dir explicitly.