Merge remote-tracking branch 'origin/5.14' into 5.15

Conflicts:
	mkspecs/features/qt_common.prf
	src/network/ssl/qsslsocket_openssl_symbols.cpp
	src/network/ssl/qsslsocket_openssl11_symbols_p.h
	src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
	src/plugins/platforms/wasm/qwasmeventdispatcher.cpp

Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: I04fb3139a0e2efd4bc2f0959f131679f192fa0f8

mkspecs/features/qt_common.prf

@@ -25,7 +25,8 @@ qtConfig(stack-protector-strong): CONFIG += stack_protector_strong
 contains(TEMPLATE, .*lib) {
     # module and plugins
     unix:qtConfig(reduce_relocations): CONFIG += bsymbolic_functions
-
+}
+contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) {
     !isEmpty(_QMAKE_SUPER_CACHE_): \
         rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
     else: \

mkspecs/features/resolve_target.prf

@@ -36,7 +36,11 @@ win32 {
                     plugin_target = $$QMAKE_PLUGIN_BUNDLE_NAME
                 else: \
                     plugin_target = $$TARGET
-                QMAKE_RESOLVED_BUNDLE = $${QMAKE_RESOLVED_TARGET}$${plugin_target}.plugin
+                isEmpty(QMAKE_BUNDLE_EXTENSION): \
+                    plugin_ext = .plugin
+                else: \
+                    plugin_ext = $$QMAKE_BUNDLE_EXTENSION
+                QMAKE_RESOLVED_BUNDLE = $${QMAKE_RESOLVED_TARGET}$${plugin_target}$${plugin_ext}
                 !shallow_bundle: \
                     QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/Contents/MacOS/$${TARGET}
                 else: \
@@ -46,7 +50,11 @@ win32 {
                     framework_target = $$QMAKE_FRAMEWORK_BUNDLE_NAME
                 else: \
                     framework_target = $$TARGET
-                QMAKE_RESOLVED_BUNDLE = $${QMAKE_RESOLVED_TARGET}$${framework_target}.framework
+                isEmpty(QMAKE_BUNDLE_EXTENSION): \
+                    framework_ext = .framework
+                else: \
+                    framework_ext = $$QMAKE_BUNDLE_EXTENSION
+                QMAKE_RESOLVED_BUNDLE = $${QMAKE_RESOLVED_TARGET}$${framework_target}$${framework_ext}
                 !shallow_bundle {
                     TEMP_VERSION = $$section(VERSION, ., 0, 0)
                     isEmpty(TEMP_VERSION):TEMP_VERSION = A

src/corelib/global/qsystemdetection.h

@@ -76,6 +76,8 @@
    The following operating systems have variants:
      LINUX    - both Q_OS_LINUX and Q_OS_ANDROID are defined when building for Android
               - only Q_OS_LINUX is defined if building for other Linux systems
+     MACOS    - both Q_OS_BSD4 and Q_OS_IOS are defined when building for iOS
+              - both Q_OS_BSD4 and Q_OS_MACOS are defined when building for macOS
      FREEBSD  - Q_OS_FREEBSD is defined only when building for FreeBSD with a BSD userland
               - Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU
 */