diff options
| author | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-04-17 13:41:09 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-04-20 05:27:38 (GMT) |
| commit | 10194aafd10824fe1919aa44083224e8bea442ca (patch) | |
| tree | d05b560090a22561ada61d7cdf0d0fc46bf833f4 /mkspecs | |
| parent | bf0033ba01fec73c06d533b57b3920b216223c2d (diff) | |
| download | Qt-10194aafd10824fe1919aa44083224e8bea442ca.zip Qt-10194aafd10824fe1919aa44083224e8bea442ca.tar.gz Qt-10194aafd10824fe1919aa44083224e8bea442ca.tar.bz2 | |
fix compilation of QtWebKit with Visual Studio
Commits 6e5774d84e7e3b68736f95fae09a084bd5b9ac7a and
014af3e99616f9ee13ca365566828f7daf77a7f6 broke the Qt build for Visual
Studio / IncrediBuild. The problem is as follows: QtWebKit has too many
entries in INCLUDE_PATHS. In moc.prf is a rule that builds a
mocinclude.tmp that contains command line options for moc.
moc gets then called with @mocinclude.tmp.
Above commits create an QMAKE_EXTRA_TARGET for the mocinclude.tmp,
which is necessary for parallel MinGW builds.
Alas, qmake -tp vc doesn't support QMAKE_EXTRA_TARGET.
See task 189914. Once this task is solved, this commit must be reverted.
Reviewed-by: joao
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/moc.prf | 7 |
1 files changed, 6 insertions, 1 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) } |