remove detection-based usage of modules which are frameworks

each qt module comes properly declared and located, so there is simply
no point in performing a search.

Change-Id: I86fad21bb8e128b85f1000cc116cc44a23642eb4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index dda1a93..dcd374b 100644 (file)
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -69,17 +69,6 @@ defineTest(qtAddModule) {
           !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE): \
                INCLUDEPATH *= $$FRAMEWORK_INCLUDE
            LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
-        } else:!qt_no_framework { #detection
-           for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
-              exists($${frmwrk_dir}/$${MODULE_NAME}.framework) {
-                QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
-                FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers
-                !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE): \
-                    INCLUDEPATH *= $$FRAMEWORK_INCLUDE
-                LINKAGE = -framework $${MODULE_NAME}
-                break()
-              }
-           }
         }
     }