diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-31 05:23:40 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-31 05:23:40 (GMT) |
| commit | f587dfeaa9d369235d347af3d14339054ee59908 (patch) | |
| tree | 3ac92f6a08d871099d8808e8d5fc59f50863bacb /mkspecs/features/moc.prf | |
| parent | feb9949a11abbf244e0bfcdc128981596758de40 (diff) | |
| parent | 9da305aedfaa5da5a3059c99ac5a5389dab42b10 (diff) | |
| download | Qt-f587dfeaa9d369235d347af3d14339054ee59908.zip Qt-f587dfeaa9d369235d347af3d14339054ee59908.tar.gz Qt-f587dfeaa9d369235d347af3d14339054ee59908.tar.bz2 | |
Merge remote branch 'staging/4.7' into HEAD
Diffstat (limited to 'mkspecs/features/moc.prf')
| -rw-r--r-- | mkspecs/features/moc.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index e1032fd..abda78f 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -14,13 +14,13 @@ win32:count($$list($$INCLUDEPATH), 40, >) { WIN_INCLUDETEMP=$$INCLUDETEMP - EOC = $$escape_expand(\n\t) + EOC = $$escape_expand(\\n\\t) if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) { # the VCPROJ generator will replace the \r\h with the coded \r\n: 
 # No other generator understands the \h - if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\r\h) - else: EOC = $$escape_expand(\\)$$escape_expand(\n\t) + if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\\r\\h) + else: EOC = $$escape_expand(\\\\\\n\\t) } unset(INCFILELIST) |