diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2014-02-06 10:26:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 15:29:53 +0100 |
| commit | 93aec932ff6471b39cd3b577079407f145996ec2 (patch) | |
| tree | 08d22c94d2c6f79bb181221356f90c925e996818 /mkspecs/winrt-x86-msvc2013 | |
| parent | f13f10ee0d7e7e93fbe73e3f763a47de0c08df65 (diff) | |
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>
Diffstat (limited to 'mkspecs/winrt-x86-msvc2013')
| -rw-r--r-- | mkspecs/winrt-x86-msvc2013/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
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 |