1 files changed, 6 insertions, 28 deletions
diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf
index 9e6b486c6e..474a195e4b 100644
--- a/mkspecs/macx-ios-clang/features/qt.prf
+++ b/mkspecs/macx-ios-clang/features/qt.prf
@@ -19,34 +19,12 @@ equals(TEMPLATE, app):contains(qt_depends, gui(-private)?) {
     QTPLUGIN.platforms = -
 
     !no_main_wrapper {
-        # We use ld to rename the _main symbol to _qt_main, so that we don't get a symbol clash
-        # with the _main we provide that calls UIApplicationMain. We need to make a copy of the
-        # original object file, as ld will not copy over DWARF debug information to the output
-        # file. Instead, it will inject a reference back to the original object file, so when
-        # Xcode runs dsymutil to make the final dSYM file it will still find the debug info
-        # for the object file that provided the original _main. This back-reference has the
-        # interesting side-effect of the debug information still referring to the original
-        # symbol name, so stack-traces will show both our wrapper main and the original
-        # user main as 'main', and adding a symbolic breakpoint for 'main' will break on
-        # both functions. Although a bit weird, it's a good thing, as the user will still be
-        # able to add symbolic breakpoints for 'main', not caring that the symbol is actually
-        # called 'qt_main' now.
-
-        macx-xcode {
-            objects_dir = "\"${OBJECT_FILE_DIR}-${CURRENT_VARIANT}\""
-            archs = "\"${ARCHS}\""
-        } else {
-            isEmpty(OBJECTS_DIR): \
-                objects_dir = .
-            else: \
-                objects_dir = $$shell_quote($$OBJECTS_DIR)
-            archs = $$shell_quote($$QMAKE_IOS_DEVICE_ARCHS $$QMAKE_IOS_SIMULATOR_ARCHS)
-        }
-
-        !isEmpty(QMAKE_PRE_LINK): \
-            QMAKE_PRE_LINK += ";"
-
-        QMAKE_PRE_LINK += $$shell_quote($$QMAKESPEC/rename_main.sh) $$objects_dir $$archs
+        # 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.
+        # Passing -e to the linker changes the entrypoint from _main to our custom
+        # wrapper that calls UIApplicationMain and dispatches back to main() once
+        # the application has started up and is ready to initialize QApplication.
+        QMAKE_LFLAGS += -Wl,-e,_qt_main_wrapper
     }
 }