Skip to content

Commit 1051fdb

Browse files
Katja Marttilajobor
authored andcommitted
*.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 <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
1 parent 8960f73 commit 1051fdb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

qmake/generators/win32/msvc_vcproj.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@ const char _slnProjectMid[] = "\") = ";
201201
const char _slnProjectEnd[] = "\nEndProject";
202202
const char _slnGlobalBeg[] = "\nGlobal";
203203
const char _slnGlobalEnd[] = "\nEndGlobal";
204-
const char _slnSolutionConf[] = "\n\tGlobalSection(SolutionConfiguration) = preSolution"
205-
"\n\t\tConfigName.0 = Debug|Win32"
206-
"\n\t\tConfigName.1 = Release|Win32"
204+
const char _slnSolutionConf[] = "\n\tGlobalSection(SolutionConfigurationPlatforms) = preSolution"
205+
"\n\t\tDebug|Win32 = Debug|Win32"
206+
"\n\t\tRelease|Win32 = Release|Win32"
207207
"\n\tEndGlobalSection";
208208
const char _slnProjDepBeg[] = "\n\tGlobalSection(ProjectDependencies) = postSolution";
209209
const char _slnProjDepEnd[] = "\n\tEndGlobalSection";
210-
const char _slnProjConfBeg[] = "\n\tGlobalSection(ProjectConfiguration) = postSolution";
210+
const char _slnProjConfBeg[] = "\n\tGlobalSection(ProjectConfigurationPlatforms) = postSolution";
211211
const char _slnProjRelConfTag1[]= ".Release|%1.ActiveCfg = Release|";
212212
const char _slnProjRelConfTag2[]= ".Release|%1.Build.0 = Release|";
213213
const char _slnProjDbgConfTag1[]= ".Debug|%1.ActiveCfg = Debug|";

0 commit comments

Comments
 (0)