diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-06 12:24:15 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-10 08:53:05 (GMT) |
| commit | 021e7a437f7666e156db5a91e4ff191aa441cc60 (patch) | |
| tree | 997b60a78f0be42a3bcedee1200f25c855fd12dd /qmake/generators/win32/msvc_vcproj.cpp | |
| parent | e0c21e2b9020a0996e077ddffb1ea632923095e4 (diff) | |
| download | Qt-021e7a437f7666e156db5a91e4ff191aa441cc60.zip Qt-021e7a437f7666e156db5a91e4ff191aa441cc60.tar.gz Qt-021e7a437f7666e156db5a91e4ff191aa441cc60.tar.bz2 | |
qmake: repair .vcxproj generation
Rubber-stamped-by: ossi
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 449dcb0..345bd3a 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -207,9 +207,9 @@ const char _slnExtSections[] = "\n\tGlobalSection(ExtensibilityGlobals) = pos VcprojGenerator::VcprojGenerator() : Win32MakefileGenerator(), - init_flag(false) + init_flag(false), + projectWriter(0) { - projectWriter = createProjectWriter(); } VcprojGenerator::~VcprojGenerator() @@ -660,6 +660,7 @@ void VcprojGenerator::init() if (init_flag) return; init_flag = true; + projectWriter = createProjectWriter(); if(project->first("TEMPLATE") == "vcsubdirs") //too much work for subdirs return; @@ -775,7 +776,7 @@ bool VcprojGenerator::mergeBuildProject(MakefileGenerator *other) warn_msg(WarnLogic, "VcprojGenerator: Cannot merge null project."); return false; } - if (other->projectFile()->first("MAKEFILE_GENERATOR") != "MSVC.NET") { + if (other->projectFile()->first("MAKEFILE_GENERATOR") != project->first("MAKEFILE_GENERATOR")) { warn_msg(WarnLogic, "VcprojGenerator: Cannot merge other types of projects! (ignored)"); return false; } @@ -804,6 +805,9 @@ void VcprojGenerator::initProject() // Own elements ----------------------------- vcProject.Name = unescapeFilePath(project->first("QMAKE_ORIG_TARGET")); switch(which_dotnet_version()) { + case NET2010: + vcProject.Version = "10.00"; + break; case NET2008: vcProject.Version = "9,00"; break; @@ -888,6 +892,7 @@ void VcprojGenerator::initConfiguration() conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT")); } else { conf.PrimaryOutput = project->first("PrimaryOutput"); + conf.OutputDirectory = "."; } conf.Name = project->values("BUILD_NAME").join(" "); @@ -906,7 +911,6 @@ void VcprojGenerator::initConfiguration() conf.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean"); conf.ImportLibrary = conf.linker.ImportLibrary; conf.IntermediateDirectory = project->first("OBJECTS_DIR"); - conf.OutputDirectory = "."; conf.WholeProgramOptimization = conf.compiler.WholeProgramOptimization; temp = project->first("UseOfATL"); if(!temp.isEmpty()) |