From 536b38c1d3c2e8da78232d86416d17ce0563f1b3 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 18 Nov 2015 09:40:48 +0100 Subject: Remove hardcoded capabilities in Windows 10 manifest template While all apps need to have internetClient as a capability, the option to provide further capabilities via qmake has been removed in the template. Instead we add the required items inside the prf and keep the manifest template as generic as possible. Task-number: QTBUG-49504 Change-Id: If26b9da277a5269a57b34e74c146b40b1b64d091 Reviewed-by: Oliver Wolff Reviewed-by: Andrew Knight --- mkspecs/features/winrt/package_manifest.prf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mkspecs/features') 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) -- cgit v1.2.3 From 2e6754d9427de8d49b264a526434f49f25e7208d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 Nov 2015 16:50:16 +0100 Subject: fix the determination whether to build a module as a framework CONFIG+=qt_framework is actually put into qconfig.pri, so it's always set in framework builds. things (sometimes) worked only by virtue of the qt_framework checks being in "else" branches of "static" checks. use lib_bundle instead, which triggers the actual framework build anyway. amends b72d1db44. Change-Id: Ib725c43476d9fb38bad940ce09905d29ff3edfa3 Reviewed-by: Simon Hausmann --- mkspecs/features/qt_module.prf | 8 +++----- mkspecs/features/qt_module_pris.prf | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 663bddffb0..0972e7f3c4 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -43,7 +43,7 @@ host_build { } mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \ - 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 = -- cgit v1.2.3 From a7965a13aa56d653d8d93085ac7e70cf230bfb43 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 Nov 2015 16:53:50 +0100 Subject: remove redundant "mac" checks qt_framework and {app,lib}_bundle imply darwin, so there is no point in testing for it. Change-Id: I9fe48c26c8e271a5575b17e92df8674d3c3a3204 Reviewed-by: Simon Hausmann --- mkspecs/features/qt.prf | 4 ++-- mkspecs/features/qt_functions.prf | 2 +- mkspecs/features/qt_module.prf | 2 +- mkspecs/features/testcase.prf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index dfff6cc091..c3448718b9 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 0972e7f3c4..e2e56c318f 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -42,7 +42,7 @@ host_build { } } -mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \ +CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \ CONFIG += lib_bundle CONFIG += relative_qt_rpath # Qt libraries should be relocatable 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) -- cgit v1.2.3