diff options
| author | Katja <katja.marttila@digia.com> | 2013-10-08 09:22:51 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-09 13:52:58 +0200 |
| commit | 8d2c6206fdf564aa75680f4fea58e31d26a3d6dd (patch) | |
| tree | 9bcea7e210c19e9b49aadf15d75d5dd86ceca916 /qmake | |
| parent | c3a171e34e1ec4ec240cf82ce76b4108e7622ba6 (diff) | |
*.sln not generated correctly for VS2012 and VS2010
msbuild fails to build project since sln not generated correctly
Task-number: QTBUG-33446
Change-Id: If92ea743b1b407446873210090aa8591a491abad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 7a633b376c..86d31b01dc 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -203,14 +203,14 @@ const char _slnProjectMid[] = "\") = "; const char _slnProjectEnd[] = "\nEndProject"; const char _slnGlobalBeg[] = "\nGlobal"; const char _slnGlobalEnd[] = "\nEndGlobal"; -const char _slnSolutionConf[] = "\n\tGlobalSection(SolutionConfiguration) = preSolution" - "\n\t\tConfigName.0 = Debug|Win32" - "\n\t\tConfigName.1 = Release|Win32" +const char _slnSolutionConf[] = "\n\tGlobalSection(SolutionConfigurationPlatforms) = preSolution" + "\n\t\tDebug|Win32 = Debug|Win32" + "\n\t\tRelease|Win32 = Release|Win32" "\n\tEndGlobalSection"; const char _slnProjDepBeg[] = "\n\tProjectSection(ProjectDependencies) = postProject"; const char _slnProjDepEnd[] = "\n\tEndProjectSection"; -const char _slnProjConfBeg[] = "\n\tGlobalSection(ProjectConfiguration) = postSolution"; +const char _slnProjConfBeg[] = "\n\tGlobalSection(ProjectConfigurationPlatforms) = postSolution"; const char _slnProjRelConfTag1[]= ".Release|%1.ActiveCfg = Release|"; const char _slnProjRelConfTag2[]= ".Release|%1.Build.0 = Release|"; const char _slnProjDbgConfTag1[]= ".Debug|%1.ActiveCfg = Debug|"; |