diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-08-10 14:54:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 08:00:21 +0200 |
| commit | 6c432b59f9f60824731c2758503b8c563652a205 (patch) | |
| tree | 253858e4708b2ebfef56e80f0c7f060e1dba8ac2 /mkspecs | |
| parent | ec5f08a4d5ceefe72d33605066f8c9d0e75bc3d0 (diff) | |
Fix vcproj file generation for incredibuild handling of moc etc targets
When incredibuild-xge had been turned on by configure then it was not
ensuring that the generated vcproj files had the right extra comments
needed to make incredibuild run moc and other tools in parallel. By
fixing the prf file to get around a problem in the parser this is now
respected.
Task-number: QTBUG-14482
Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit fb3c850581953983588d49391f40f03cc7e61e62)
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/incredibuild_xge.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf index 97ccc44066..c40d1f4583 100644 --- a/mkspecs/features/incredibuild_xge.prf +++ b/mkspecs/features/incredibuild_xge.prf @@ -6,6 +6,7 @@ contains(TEMPLATE, "vc.*") { win32-msvc2*|wince*msvc*: EOC = $$escape_expand(\\r\\h) for(xge, INCREDIBUILD_XGE) { - $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands) + xgevar = $${xge}.commands + $$xgevar = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands) } } |