Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev

7 files changed, 14 insertions, 15 deletions

diff --git a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
index 9e188084ad..d091ea3b82 100644
--- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
@@ -43,8 +43,5 @@
       </uap:VisualElements>
     </Application>
   </Applications>
-
-  <Capabilities>
-    <Capability Name=\"internetClient\" />
-  </Capabilities>
+  $${WINRT_MANIFEST.capabilities}
 </Package>
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 4ef93af2e9..c041c306c1 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -89,7 +89,7 @@ for(ever) {
         MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS
 
         LINKAGE =
-        mac:contains(MODULE_CONFIG, lib_bundle) {
+        contains(MODULE_CONFIG, lib_bundle) {
             FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers
             !qt_no_framework_direct_includes {
                 INCLUDEPATH *= $$FRAMEWORK_INCLUDE
@@ -111,7 +111,7 @@ for(ever) {
 
             # Re-insert the major version in the library name (cf qt5LibraryTarget above)
             # unless it's a framework build
-            !mac|!contains(MODULE_CONFIG, lib_bundle): \
+            !contains(MODULE_CONFIG, lib_bundle): \
                 MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION,
 
             isEmpty(LINKAGE) {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 6616aa4230..403b847ac1 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -15,7 +15,7 @@ defineReplace(qtPlatformTargetSuffix) {
 
 defineReplace(qtLibraryTarget) {
    LIBRARY_NAME = $$1
-   mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
+   CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
       QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME
       export(QMAKE_FRAMEWORK_BUNDLE_NAME)
    }
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 663bddffb0..e2e56c318f 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -42,8 +42,8 @@ host_build {
     }
 }
 
-mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
-    CONFIG += qt_framework
+CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
+    CONFIG += lib_bundle
 
 CONFIG += relative_qt_rpath  # Qt libraries should be relocatable
 
@@ -106,7 +106,7 @@ else: \
     DEFINES += QT_BUILD_$${ucmodule}_LIB
 
 # OS X and iOS frameworks
-qt_framework {
+lib_bundle {
    # Set the CFBundleIdentifier prefix for Qt frameworks
    QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project
    #QMAKE_FRAMEWORK_VERSION = 4.0
@@ -115,8 +115,6 @@ qt_framework {
         CONFIG += bundle
         QMAKE_BUNDLE_EXTENSION = .framework
         QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib
-   } else {
-        CONFIG += lib_bundle
    }
    CONFIG -= qt_install_headers #no need to install these as well
    !debug_and_release|!build_all|CONFIG(release, debug|release) {
@@ -239,7 +237,7 @@ load(qt_installs)
 load(qt_targets)
 
 # this builds on top of qt_common
-!internal_module:!qt_framework:if(unix|mingw) {
+!internal_module:!lib_bundle:if(unix|mingw) {
     CONFIG += create_pc
     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
     host_build: \
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 8c05b90cd6..3f21a0f7d5 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -55,7 +55,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         module_rundep =
     static: \
         module_build_type = staticlib
-    else: qt_framework: \
+    else: lib_bundle: \
         module_build_type = lib_bundle
     else: \
         module_build_type =
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index a6ef930128..6f6f073f70 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -27,7 +27,7 @@ check.commands += $(TESTRUNNER)
 unix {
     isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = .
 
-    mac:app_bundle: \
+    app_bundle: \
         check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET)
     else: \
         check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET)
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index 9b4a6672e5..3520fcdf93 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -108,6 +108,10 @@
 
     INDENT = "$$escape_expand(\\r\\n)  "
 
+    # All Windows 10 applications need to have internetClient. It is also not marked as additional
+    # capability anymore and is assumed to be standard.
+    *-msvc2015: WINRT_MANIFEST.capabilities += internetClient
+
     # Capabilities are given as a string list and may change with the configuration (network, sensors, etc.)
     WINRT_MANIFEST.capabilities = $$unique(WINRT_MANIFEST.capabilities)
     WINRT_MANIFEST.capabilities_device = $$unique(WINRT_MANIFEST.capabilities_device)