summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@theqtcompany.com>2015-02-02 15:57:32 (GMT)
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-02-02 16:26:43 (GMT)
commit1051fdb87d302455c1a959fe89d0b04734dc4d6c (patch)
tree7c75c379990854b0a3feb5487b11b64399e80894
parent8960f7356796948b161159cff404a9ebd1624c5f (diff)
downloadQt-1051fdb87d302455c1a959fe89d0b04734dc4d6c.zip
Qt-1051fdb87d302455c1a959fe89d0b04734dc4d6c.tar.gz
Qt-1051fdb87d302455c1a959fe89d0b04734dc4d6c.tar.bz2
*.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 (cherry picked from qtbase/3515365b9843b12e488880a0685b71f7b3250c33) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index ca5db41..029ab13 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -201,13 +201,13 @@ 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\tGlobalSection(ProjectDependencies) = postSolution";
const char _slnProjDepEnd[] = "\n\tEndGlobalSection";
-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|";