diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-24 06:41:22 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-24 07:36:43 (GMT) |
| commit | fdd6436987a114521168f48b9b96013772af7d49 (patch) | |
| tree | 659e30fa2a8be82059f64ccd2d89c7055db209c6 /qmake/generators | |
| parent | 9d77ff2064be61d2fdf2c034b13ef75cc4905bb3 (diff) | |
| download | Qt-fdd6436987a114521168f48b9b96013772af7d49.zip Qt-fdd6436987a114521168f48b9b96013772af7d49.tar.gz Qt-fdd6436987a114521168f48b9b96013772af7d49.tar.bz2 | |
qmake vcxproj generator: fix bug when using CharacterSet=1 in .pro file
Task-number: QTBUG-13080
Reviewed-by: Martin Petersson
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_vcxproj.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp index f68a435..271d9ae 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -202,7 +202,6 @@ void VcxprojGenerator::initConfiguration() conf.CharacterSet = "NotSet"; break; } - conf.CharacterSet = charSet(temp.isEmpty() ? (short)charSetNotSet : temp.toShort()); } conf.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean"); conf.ImportLibrary = conf.linker.ImportLibrary; |