diff options
| author | Andy Shaw <qt-info@nokia.com> | 2009-07-15 09:41:38 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2009-07-15 09:41:38 (GMT) |
| commit | 4dde6dac24027a4dfede4f79077df3d91de11efa (patch) | |
| tree | 7b36917132b6d5144ca0e5eee4ef845b838bd4f8 /mkspecs/features/moc.prf | |
| parent | 6b9328056591af2c48bed67f372693f030ba8c20 (diff) | |
| download | Qt-4dde6dac24027a4dfede4f79077df3d91de11efa.zip Qt-4dde6dac24027a4dfede4f79077df3d91de11efa.tar.gz Qt-4dde6dac24027a4dfede4f79077df3d91de11efa.tar.bz2 | |
Revert 6b9328 and fix the original dependency problem again
Reviewed-by: Joerg
Diffstat (limited to 'mkspecs/features/moc.prf')
| -rw-r--r-- | mkspecs/features/moc.prf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 40101de..33a58ad 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -65,6 +65,9 @@ moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAK moc_header.input = HEADERS moc_header.variable_out = SOURCES moc_header.name = MOC ${QMAKE_FILE_IN} +if(!contains(TEMPLATE, "vc.*") & !contains(TEMPLATE_PREFIX, "vc")) { + !isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP +} silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands QMAKE_EXTRA_COMPILERS += moc_header INCREDIBUILD_XGE += moc_header @@ -76,6 +79,9 @@ moc_source.commands = ${QMAKE_FUNC_mocCmd} moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC} moc_source.input = SOURCES OBJECTIVE_SOURCES moc_source.name = MOC ${QMAKE_FILE_IN} +if(!contains(TEMPLATE, "vc.*") & !contains(TEMPLATE_PREFIX, "vc")) { + !isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP +} silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands QMAKE_EXTRA_COMPILERS += moc_source INCREDIBUILD_XGE += moc_source |