diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-09-22 09:00:15 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-09-22 09:36:18 +0000 |
| commit | 2ce8590e0cc0f9b1ceec98e5df1d6ccd2e804bd9 (patch) | |
| tree | e075ec2937634e83847c15638fed19cd2db40759 | |
| parent | 50908f023d83257dbc0b6d17bfe29e2f101615af (diff) | |
win32: Fix Visual Studio project generation
With the removal of Windows CE support(52623d6d) the logic of these
checks have changed, as it was always true for non Windows CE builds
before.
This did not affect WinRT, as those mkspecs define VCPROJ_ARCH
explicitly in their qmake.conf.
Task-number: QTBUG-55753
Change-Id: Ie2eddf197c17fcbf7343b444cfe8940a332a545c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 1155e45bd7..cb44937bea 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -969,7 +969,7 @@ void VcprojGenerator::initProject() vcProject.Keyword = project->first("VCPROJ_KEYWORD").toQString(); if (!project->isEmpty("VCPROJ_ARCH")) { vcProject.PlatformName = project->first("VCPROJ_ARCH").toQString(); - } else if (project->isHostBuild()) { + } else { vcProject.PlatformName = (is64Bit ? "x64" : "Win32"); } vcProject.SdkVersion = project->first("WINSDK_VER").toQString(); @@ -1051,7 +1051,7 @@ void VcprojGenerator::initConfiguration() conf.ConfigurationName = conf.Name; if (!project->isEmpty("VCPROJ_ARCH")) { conf.Name += "|" + project->first("VCPROJ_ARCH"); - } else if (project->isHostBuild()) { + } else { conf.Name += (is64Bit ? "|x64" : "|Win32"); } conf.ATLMinimizesCRunTimeLibraryUsage = (project->first("ATLMinimizesCRunTimeLibraryUsage").isEmpty() ? _False : _True); |