diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-17 15:05:47 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-17 16:42:14 (GMT) |
| commit | 5084d1694e62c3c704c83cc0f27afb6a39b20781 (patch) | |
| tree | f48ef2352ccc07c6a719fc30ca87e0353bff927b /mkspecs/features | |
| parent | 4dc56aa381d72335f8759da0bb8ca29897fce3a1 (diff) | |
| download | Qt-5084d1694e62c3c704c83cc0f27afb6a39b20781.zip Qt-5084d1694e62c3c704c83cc0f27afb6a39b20781.tar.gz Qt-5084d1694e62c3c704c83cc0f27afb6a39b20781.tar.bz2 | |
amend "purge msvc.net and msvc2002 makespecs"
- win32-msvc.net/qplatformdefs.h was included from msvc2003. inline it.
- purge references to msvc.net from feature files
Reviewed-by: mariusSO
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/incredibuild_xge.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/moc.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/win32/thread.prf | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf index 2fce443..e241ca4 100644 --- a/mkspecs/features/incredibuild_xge.prf +++ b/mkspecs/features/incredibuild_xge.prf @@ -3,7 +3,7 @@ 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 - win32-msvc.net|win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\r\h) + win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\r\h) for(xge, INCREDIBUILD_XGE) { eval($${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands)) diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index e4b7dae..e806ef6 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -22,7 +22,7 @@ win32:count($$list($$INCPATH), 40, >) { 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-msvc.net|win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\r\h) + if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\r\h) else: EOC = $$escape_expand(\\)$$escape_expand(\n\t) } diff --git a/mkspecs/features/win32/thread.prf b/mkspecs/features/win32/thread.prf index aa844d2..76354a8 100644 --- a/mkspecs/features/win32/thread.prf +++ b/mkspecs/features/win32/thread.prf @@ -23,8 +23,4 @@ debug { } } -win32-msvc|win32-msvc.net { - !contains(DEFINES, QT_DLL):!target_qt:!isEqual(TARGET, qtmain):QMAKE_LFLAGS += /NODEFAULTLIB:"libc" -} - QMAKE_LIBS += $$QMAKE_LIBS_RTMT |