From 93aec932ff6471b39cd3b577079407f145996ec2 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@digia.com>
Date: Thu, 6 Feb 2014 10:26:02 +0100
Subject: WinRT: Use correct architecture values in manifests and vs

Using the same architecture value in VC Project and manifest
files only makes sense for x64. Instead of doing magic we
just set the correct values inside the mkspecs. VCPROJ_ARCH
is used for Visual Studio, while the manifests use
WINRT_MANIFEST.architecture.

WINRT_MANIFEST.architecture was added to x64 mkspecs for
consistency and phone mkspecs do not use WINRT_MANIFEST.architecture
so it does not have to be set there.

Change-Id: I009473104875b4add8c0530dc6f51177919e997b
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
---
 mkspecs/winphone-x86-msvc2012/qmake.conf | 2 +-
 mkspecs/winrt-arm-msvc2012/qmake.conf    | 1 +
 mkspecs/winrt-arm-msvc2013/qmake.conf    | 1 +
 mkspecs/winrt-x64-msvc2012/qmake.conf    | 1 +
 mkspecs/winrt-x64-msvc2013/qmake.conf    | 1 +
 mkspecs/winrt-x86-msvc2012/qmake.conf    | 3 ++-
 mkspecs/winrt-x86-msvc2013/qmake.conf    | 3 ++-
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mkspecs/winphone-x86-msvc2012/qmake.conf b/mkspecs/winphone-x86-msvc2012/qmake.conf
index 1329370900..4b8a92ea3b 100644
--- a/mkspecs/winphone-x86-msvc2012/qmake.conf
+++ b/mkspecs/winphone-x86-msvc2012/qmake.conf
@@ -13,7 +13,7 @@ QMAKE_LFLAGS           += /MACHINE:X86
 
 QMAKE_LIBS             += WindowsPhoneCore.lib PhoneAppModelHost.lib ws2_32.lib
 
-VCPROJ_ARCH             = x86
+VCPROJ_ARCH             = Win32
 MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = WP80
diff --git a/mkspecs/winrt-arm-msvc2012/qmake.conf b/mkspecs/winrt-arm-msvc2012/qmake.conf
index 41594a3547..b2603cfb2f 100644
--- a/mkspecs/winrt-arm-msvc2012/qmake.conf
+++ b/mkspecs/winrt-arm-msvc2012/qmake.conf
@@ -17,3 +17,4 @@ MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = win8
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = arm
diff --git a/mkspecs/winrt-arm-msvc2013/qmake.conf b/mkspecs/winrt-arm-msvc2013/qmake.conf
index 83ab228d7f..d1ab60723d 100644
--- a/mkspecs/winrt-arm-msvc2013/qmake.conf
+++ b/mkspecs/winrt-arm-msvc2013/qmake.conf
@@ -19,3 +19,4 @@ MSVC_VER                = 12.0
 WINSDK_VER              = 8.1
 WINTARGET_VER           = winv6.3
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = arm
diff --git a/mkspecs/winrt-x64-msvc2012/qmake.conf b/mkspecs/winrt-x64-msvc2012/qmake.conf
index f6e360ae12..a0c64c695f 100644
--- a/mkspecs/winrt-x64-msvc2012/qmake.conf
+++ b/mkspecs/winrt-x64-msvc2012/qmake.conf
@@ -17,3 +17,4 @@ MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = win8
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x64
diff --git a/mkspecs/winrt-x64-msvc2013/qmake.conf b/mkspecs/winrt-x64-msvc2013/qmake.conf
index 2c01450ed4..594d0dafd0 100644
--- a/mkspecs/winrt-x64-msvc2013/qmake.conf
+++ b/mkspecs/winrt-x64-msvc2013/qmake.conf
@@ -19,3 +19,4 @@ MSVC_VER                = 12.0
 WINSDK_VER              = 8.1
 WINTARGET_VER           = winv6.3
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x64
diff --git a/mkspecs/winrt-x86-msvc2012/qmake.conf b/mkspecs/winrt-x86-msvc2012/qmake.conf
index 664212624c..6e6ea4664d 100644
--- a/mkspecs/winrt-x86-msvc2012/qmake.conf
+++ b/mkspecs/winrt-x86-msvc2012/qmake.conf
@@ -12,8 +12,9 @@ QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86
 
 QMAKE_LIBS             += windowscodecs.lib kernel32.lib ole32.lib
 
-VCPROJ_ARCH             = x86
+VCPROJ_ARCH             = Win32
 MSVC_VER                = 11.0
 WINSDK_VER              = 8.0
 WINTARGET_VER           = win8
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x86
diff --git a/mkspecs/winrt-x86-msvc2013/qmake.conf b/mkspecs/winrt-x86-msvc2013/qmake.conf
index 384b51a1e6..77b906c7d3 100644
--- a/mkspecs/winrt-x86-msvc2013/qmake.conf
+++ b/mkspecs/winrt-x86-msvc2013/qmake.conf
@@ -14,8 +14,9 @@ QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86
 
 QMAKE_LIBS             += windowscodecs.lib kernel32.lib ole32.lib
 
-VCPROJ_ARCH             = x86
+VCPROJ_ARCH             = Win32
 MSVC_VER                = 12.0
 WINSDK_VER              = 8.1
 WINTARGET_VER           = winv6.3
 WINRT_MANIFEST          = $$PWD/../common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+WINRT_MANIFEST.architecture = x86
-- 
cgit v1.2.3