summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/winrt_winphone/qmake.conf
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-13 07:39:30 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-04-13 09:45:58 +0000
commiteb3e3853c4de146410478fca652ea24f3943f774 (patch)
treedf215a0379d5ce40c5c7725d1f00af982b280c03 /mkspecs/common/winrt_winphone/qmake.conf
parent33044b83c261c485faa0a6f367773138f9892f76 (diff)
parentb94773c9c838a0b3db1bced0bc8daf5b04aefc29 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'mkspecs/common/winrt_winphone/qmake.conf')
-rw-r--r--mkspecs/common/winrt_winphone/qmake.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf
index a9450b0c32..b5e0c7cc71 100644
--- a/mkspecs/common/winrt_winphone/qmake.conf
+++ b/mkspecs/common/winrt_winphone/qmake.conf
@@ -9,7 +9,7 @@ include(../angle.conf)
MAKEFILE_GENERATOR = MSBUILD
QMAKE_COMPILER = msvc
QMAKE_PLATFORM = winrt win32
-CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target package_manifest rtti
+CONFIG = package_manifest $$CONFIG incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target rtti
DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT Q_BYTE_ORDER=Q_LITTLE_ENDIAN \
QT_NO_PRINTER QT_NO_PRINTDIALOG # TODO: Remove when printing is re-enabled
@@ -95,6 +95,9 @@ VCSOLUTION_EXTENSION = .sln
VCPROJ_KEYWORD = Qt4VSv1.0
WINRT_ASSETS_PATH = $$PWD/assets
+WINRT_MANIFEST.capabilities = defaults
+WINRT_MANIFEST.capabilities_device = defaults
+
include(../msvc-base.conf)
unset(MSC_VER)