From 880db10f553d1190ab79f3dd45a89bfa28e5c84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 16 Oct 2020 11:30:47 +0200 Subject: [PATCH] iOS: Remove dead code for linking to platform plugin The code only existed to avoid the auto-generated Q_IMPORT_PLUGIN(QIOSIntegrationPlugin), but nowadays with bitcode enabled the code is not used, plus we end up with this auto-generated file for other plugins anyways. Change-Id: I91c8c88f4e825caab7d7d5250edaba8c57cb7374 Reviewed-by: Alexandru Croitor --- mkspecs/features/uikit/qt.prf | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/mkspecs/features/uikit/qt.prf b/mkspecs/features/uikit/qt.prf index 4475c137dc7..a1720c1535a 100644 --- a/mkspecs/features/uikit/qt.prf +++ b/mkspecs/features/uikit/qt.prf @@ -1,25 +1,6 @@ qt_depends = $$resolve_depends(QT, "QT.") !watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?) { - LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/platforms - - lib_name = qios - lib_path_and_base = $$[QT_INSTALL_PLUGINS/get]/platforms/lib$${lib_name}$$qtPlatformTargetSuffix() - LIBS += -l$${lib_name}$$qtPlatformTargetSuffix() $$fromfile($${lib_path_and_base}.prl, QMAKE_PRL_LIBS) - - !bitcode { - # By marking qt_registerPlatformPlugin as undefined, we ensure that - # the plugin.o translation unit is considered for inclusion in - # the final binary, which in turn ensures that the plugin's - # static initializer is included and run. - QMAKE_LFLAGS += -u _qt_registerPlatformPlugin - - # We do link and dependency resolution for the platform plugin - # manually, since we know we always need the plugin, so we don't - # need to generate an import for it. - QTPLUGIN.platforms = - - } - !no_main_wrapper { # The LC_MAIN load command available in iOS 6.0 and above allows dyld to # directly call the entrypoint instead of going through _start in crt.o.