1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake vcproj: Support setting the SDK version

Browse Source 
This adds the required members to allow setting the SDK version, and uses
them when creating WinRT projects.

Task-number: QTBUG-35328

Change-Id: I500ea77c41e27cbcc850462034c0eba8c5d1f124
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
This commit is contained in:
Andrew Knight 2013-12-29 14:54:48 +02:00 committed by The Qt Project
parent fe73b92ed0
commit d5e52ecf6d
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -632,18 +632,19 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
<< tagValue("RootNamespace", tool.Name) << tagValue("RootNamespace", tool.Name)
<< tagValue("Keyword", tool.Keyword); << tagValue("Keyword", tool.Keyword);
if (tool.SingleProjects.at(0).Configuration.WinRT) { if (isWinRT) {
xml << tagValue("MinimumVisualStudioVersion", "11.0"); xml << tagValue("MinimumVisualStudioVersion", tool.Version);
if (tool.SingleProjects.at(0).Configuration.WinPhone) if (isPhone) {
xml << tagValue("WinMDAssembly", "true"); xml << tagValue("WinMDAssembly", "true");
else if (tool.SingleProjects.at(0).Configuration.ConfigurationType == typeApplication) {
xml << tagValue("AppContainerApplication", "true"); xml << tagValue("XapOutputs", "true");
} xml << tagValue("XapFilename", "$(RootNamespace)_$(Configuration)_$(Platform).xap");
}
if (tool.SingleProjects.at(0).Configuration.WinPhone } else {
&& tool.SingleProjects.at(0).Configuration.ConfigurationType == typeApplication) { xml << tagValue("AppContainerApplication", "true")
xml << tagValue("XapOutputs", "true"); << tagValue("ApplicationType", "Windows Store")
xml << tagValue("XapFilename", "$(RootNamespace)_$(Configuration)_$(Platform).xap"); << tagValue("ApplicationTypeRevision", tool.SdkVersion);
}
} }
xml << closetag(); xml << closetag();

2
qmake/generators/win32/msvc_objectmodel.h
View File

@ -990,6 +990,7 @@ public:
QString SccProjectName; QString SccProjectName;
QString SccLocalPath; QString SccLocalPath;
QString PlatformName; QString PlatformName;
QString SdkVersion;
// XML sub-parts // XML sub-parts
VCConfiguration Configuration; VCConfiguration Configuration;
@ -1129,6 +1130,7 @@ public:
QString SccProjectName; QString SccProjectName;
QString SccLocalPath; QString SccLocalPath;
QString PlatformName; QString PlatformName;
QString SdkVersion;
// Single projects // Single projects
QList<VCProjectSingleConfig> SingleProjects; QList<VCProjectSingleConfig> SingleProjects;

2
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -289,6 +289,7 @@ bool VcprojGenerator::writeProjectMakefile()
mergedProjects.at(0)->writePrlFile(); mergedProjects.at(0)->writePrlFile();
mergedProject.Name = project->first("QMAKE_PROJECT_NAME").toQString(); mergedProject.Name = project->first("QMAKE_PROJECT_NAME").toQString();
mergedProject.Version = mergedProjects.at(0)->vcProject.Version; mergedProject.Version = mergedProjects.at(0)->vcProject.Version;
mergedProject.SdkVersion = mergedProjects.at(0)->vcProject.SdkVersion;
mergedProject.ProjectGUID = project->isEmpty("QMAKE_UUID") ? getProjectUUID().toString().toUpper() : project->first("QMAKE_UUID").toQString(); mergedProject.ProjectGUID = project->isEmpty("QMAKE_UUID") ? getProjectUUID().toString().toUpper() : project->first("QMAKE_UUID").toQString();
mergedProject.Keyword = project->first("VCPROJ_KEYWORD").toQString(); mergedProject.Keyword = project->first("VCPROJ_KEYWORD").toQString();
mergedProject.SccProjectName = mergedProjects.at(0)->vcProject.SccProjectName; mergedProject.SccProjectName = mergedProjects.at(0)->vcProject.SccProjectName;
@ -915,6 +916,7 @@ void VcprojGenerator::initProject()
} else { } else {
vcProject.PlatformName = project->values("CE_SDK").join(' ') + " (" + project->first("CE_ARCH") + ")"; vcProject.PlatformName = project->values("CE_SDK").join(' ') + " (" + project->first("CE_ARCH") + ")";
} }
vcProject.SdkVersion = project->first("WINSDK_VER").toQString();
// These are not used by Qt, but may be used by customers // These are not used by Qt, but may be used by customers
vcProject.SccProjectName = project->first("SCCPROJECTNAME").toQString(); vcProject.SccProjectName = project->first("SCCPROJECTNAME").toQString();
vcProject.SccLocalPath = project->first("SCCLOCALPATH").toQString(); vcProject.SccLocalPath = project->first("SCCLOCALPATH").toQString();