From 9f97990815df088e748c6aaf1abc164f9648e609 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 25 Feb 2014 16:32:47 +0200 Subject: [PATCH] Fix WinRT design-mode manifest location. QMake always places makefiles, including vcproj files, to OUT_PWD. BUILD_DIR i.e. QMAKE_RESOLVED_TARGET refers to location where target is generated. If TARGET is specified in pro file with path, such as: TARGET = ../../debug/tst_qlocale The QMAKE_RESOLVED_TARGET refers to that path, and it differs from OUT_PWD. Because Visual Studio requires a design-mode manifest in the same location as the vcproj, resolved BUILD_DIR separately based on TEMPLATE. Change-Id: I8dbaa862a5f53ac168f4643c17baabd7b4f0287d Reviewed-by: Andrew Knight Reviewed-by: Oliver Wolff Reviewed-by: Oswald Buddenhagen --- mkspecs/features/winrt/package_manifest.prf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 969a6780ce..8c2943ec70 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -39,8 +39,13 @@ manifest_file.input = $$WINRT_MANIFEST - load(resolve_target) - BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET) + contains(TEMPLATE, "vc.*") { + BUILD_DIR = $$OUT_PWD + } else { + load(resolve_target) + BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET) + } + winphone: \ manifest_file.output = $$BUILD_DIR/WMAppManifest.xml else: contains(TEMPLATE, "vc.*"): \