From fdd6436987a114521168f48b9b96013772af7d49 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 24 Aug 2010 08:41:22 +0200 Subject: qmake vcxproj generator: fix bug when using CharacterSet=1 in .pro file Task-number: QTBUG-13080 Reviewed-by: Martin Petersson --- qmake/generators/win32/msvc_vcxproj.cpp | 1 - 1 file changed, 1 deletion(-) 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; -- cgit v0.12