summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-17 13:41:09 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-20 05:27:38 (GMT)
commit10194aafd10824fe1919aa44083224e8bea442ca (patch)
treed05b560090a22561ada61d7cdf0d0fc46bf833f4 /src/gui
parentbf0033ba01fec73c06d533b57b3920b216223c2d (diff)
downloadQt-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 'src/gui')
0 files changed, 0 insertions, 0 deletions