make headers-only modules work for framework builds

Change-Id: I00125883335c5b8cc556b4e4c964e11c55aa989b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

mkspecs/features/qt_module.prf

@@ -103,7 +103,14 @@ mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
    # Set the CFBundleIdentifier prefix for Qt frameworks
    QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project
    #QMAKE_FRAMEWORK_VERSION = 4.0
-   CONFIG += lib_bundle sliced_bundle qt_framework
+   CONFIG += sliced_bundle qt_framework
+   qt_no_install_library {
+        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) {
         FRAMEWORK_HEADERS.version = Versions

mkspecs/features/qt_module_pris.prf

@@ -62,14 +62,14 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         module_rundep = "QT.$${MODULE_ID}.run_depends = $$replace(QT_PRIVATE, -private$, _private)"
     else: \
         module_rundep =
-    equals(TEMPLATE, aux): \
-        module_build_type = no_link
-    else:static: \
+    static: \
         module_build_type = staticlib
     else:mac:contains(QT_CONFIG, qt_framework): \
         module_build_type = lib_bundle
     else: \
         module_build_type =
+    equals(TEMPLATE, aux): \
+        module_build_type += no_link
     internal_module: \
         module_build_type += internal_module
     ltcg: \