diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:48:09 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:48:09 (GMT) |
| commit | 1139eb432a18d556efb4ecfc079e82c2e2093b96 (patch) | |
| tree | 57bbe6a7588ba01d88f0a9b9b28e4d95beadad1d /mkspecs | |
| parent | 2366667fc97eb6a56203b2dd7dac776ff4164abd (diff) | |
| parent | db4e2a600c53ad857d7fa3f7d84ac995215ecf93 (diff) | |
| download | Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.zip Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.gz Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.bz2 | |
Merge branch 'master' of ../../qt/qt into kinetic-declarativeui
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/moc.prf | 7 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 7c4ff28..60508c8 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -47,7 +47,12 @@ win32:count($$list($$INCPATH), 40, >) { defineReplace(mocCmd) { !isEmpty(WIN_INCLUDETEMP) { - return($$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2) + RET = + if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) { + RET += $$mocinclude.commands + } + RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2 + return($$RET) } return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2) } 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. |