From 4bbbe06bef637e97f67db8b0b31bffb9cdd849d3 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 12 Feb 2013 00:25:23 +0100 Subject: qmake: added file deployment support for winrt and winphone targets The user needs to specify the DEPLOYMENT variable. The syntax is the same as previously used for DEPLOYMENT. For more info please refer to the qmake documentation. The change adds a new itemgroup, "Deployment Files". All files in this itemgroup are marked as DeploymentContent and are then packaged with the application either as XAP or the WinRT specific file format. Change-Id: Icf85887287c1c97eb782704340eaa3f8dde6719e Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msvc_objectmodel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'qmake/generators/win32/msvc_objectmodel.cpp') diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 2b343fd9f7..09213bec8e 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2475,6 +2475,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool) outputFilter(tempProj, xml, "TranslationFiles"); outputFilter(tempProj, xml, "FormFiles"); outputFilter(tempProj, xml, "ResourceFiles"); + outputFilter(tempProj, xml, "DeploymentFiles"); QSet extraCompilersInProject; for (int i = 0; i < tool.ExtraCompilersFiles.count(); ++i) { @@ -2527,6 +2528,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProject &tool) outputFilter(tool, xml, "TranslationFiles"); outputFilter(tool, xml, "FormFiles"); outputFilter(tool, xml, "ResourceFiles"); + outputFilter(tool, xml, "DeploymentFiles"); for (int x = 0; x < tool.ExtraCompilers.count(); ++x) { outputFilter(tool, xml, tool.ExtraCompilers.at(x)); } @@ -2878,6 +2880,8 @@ void VCProjectWriter::outputFilter(VCProject &project, XmlOutput &xml, const QSt filter = projectSingleConfig.FormFiles; } else if (filtername == "ResourceFiles") { filter = projectSingleConfig.ResourceFiles; + } else if (filtername == "DeploymentFiles") { + filter = projectSingleConfig.DeploymentFiles; } else { // ExtraCompilers filter = project.SingleProjects[i].filterForExtraCompiler(filtername); @@ -2938,6 +2942,8 @@ void VCProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, cons filter = projectSingleConfig.FormFiles; } else if (filtername == "ResourceFiles") { filter = projectSingleConfig.ResourceFiles; + } else if (filtername == "DeploymentFiles") { + filter = projectSingleConfig.DeploymentFiles; } else { // ExtraCompilers filter = project.SingleProjects[i].filterForExtraCompiler(filtername); -- cgit v1.2.3