diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:13:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:14:15 +0100 |
| commit | 846cc4c75cc06def67e831c8cb3c9edaef24f8f0 (patch) | |
| tree | cf8cd76a5a610a6264583148b2c0549f7514dde3 /mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in | |
| parent | 9e4a215a2569a04010292c8718d0f0569bc06c12 (diff) | |
| parent | 0d0fb04d505d105fb4b2fc71d68f729ce670b12e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/network/access/qhttpthreaddelegate.cpp
Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91
Diffstat (limited to 'mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in')
| -rw-r--r-- | mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in index 8c214871e3..fcc4d75b0f 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in @@ -41,4 +41,4 @@ <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities> <Dependencies>$${WINRT_MANIFEST.dependencies}</Dependencies> </Package> -<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. Remove this line to prevent this file from getting overwritten by qmake. --> +<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. --> |