summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2014-02-25 16:32:47 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-14 15:26:29 +0100
commit9f97990815df088e748c6aaf1abc164f9648e609 (patch)
tree0d74123cfc32a668b8c6ecc57f2ae93579cf1fb0
parentc026912e84df16a17b761ffb520b4f068e3739af (diff)
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 <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--mkspecs/features/winrt/package_manifest.prf9
1 files 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.*"): \