diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:49 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:49 (GMT) |
| commit | 3ca305cf25033477b73121aa6622f8c9115285ec (patch) | |
| tree | 59edd09384ffca0b5e68a777a032a9aa3f65a9df /qmake/generators/win32/msvc_vcxproj.cpp | |
| parent | 2cac8ca88c9b5b2f9d3040b1543d88ecee52da99 (diff) | |
| parent | d3b898e973662707f9644b4fe5f8d18849929723 (diff) | |
| download | Qt-3ca305cf25033477b73121aa6622f8c9115285ec.zip Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.gz Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.bz2 | |
Merge branch '4.7' into qmldocs
Diffstat (limited to 'qmake/generators/win32/msvc_vcxproj.cpp')
| -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; |