1 files changed, 21 insertions, 31 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintrospection.mm b/src/plugins/platforms/cocoa/qcocoaintrospection.mm
index 806effc929..84b16813dc 100644
--- a/src/plugins/platforms/cocoa/qcocoaintrospection.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintrospection.mm
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -79,43 +79,33 @@ QT_BEGIN_NAMESPACE
 
 void qt_cocoa_change_implementation(Class baseClass, SEL originalSel, Class proxyClass, SEL replacementSel, SEL backupSel)
 {
-#ifndef QT_MAC_USE_COCOA
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
-#endif
-    {
-        // The following code replaces the _implementation_ for the selector we want to hack
-        // (originalSel) with the implementation found in proxyClass. Then it creates
-        // a new 'backup' method inside baseClass containing the old, original,
-        // implementation (fakeSel). You can let the proxy implementation of originalSel
-        // call fakeSel if needed (similar approach to calling a super class implementation).
-        // fakeSel must also be implemented in proxyClass, as the signature is used
-        // as template for the method one we add into baseClass.
-        // NB: You will typically never create any instances of proxyClass; we use it
-        // only for stealing its contents and put it into baseClass.
-        if (!replacementSel)
-            replacementSel = originalSel;
+    // The following code replaces the _implementation_ for the selector we want to hack
+    // (originalSel) with the implementation found in proxyClass. Then it creates
+    // a new 'backup' method inside baseClass containing the old, original,
+    // implementation (fakeSel). You can let the proxy implementation of originalSel
+    // call fakeSel if needed (similar approach to calling a super class implementation).
+    // fakeSel must also be implemented in proxyClass, as the signature is used
+    // as template for the method one we add into baseClass.
+    // NB: You will typically never create any instances of proxyClass; we use it
+    // only for stealing its contents and put it into baseClass.
+    if (!replacementSel)
+        replacementSel = originalSel;
 
-        Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
-        Method replacementMethod = class_getInstanceMethod(proxyClass, replacementSel);
-        IMP originalImp = method_setImplementation(originalMethod, method_getImplementation(replacementMethod));
+    Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
+    Method replacementMethod = class_getInstanceMethod(proxyClass, replacementSel);
+    IMP originalImp = method_setImplementation(originalMethod, method_getImplementation(replacementMethod));
 
-        if (backupSel) {
-            Method backupMethod = class_getInstanceMethod(proxyClass, backupSel);
-            class_addMethod(baseClass, backupSel, originalImp, method_getTypeEncoding(backupMethod));
-        }
+    if (backupSel) {
+        Method backupMethod = class_getInstanceMethod(proxyClass, backupSel);
+        class_addMethod(baseClass, backupSel, originalImp, method_getTypeEncoding(backupMethod));
     }
 }
 
 void qt_cocoa_change_back_implementation(Class baseClass, SEL originalSel, SEL backupSel)
 {
-#ifndef QT_MAC_USE_COCOA
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
-#endif
-    {
-        Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
-        Method backupMethodInBaseClass = class_getInstanceMethod(baseClass, backupSel);
-        method_setImplementation(originalMethod, method_getImplementation(backupMethodInBaseClass));
-    }
+    Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
+    Method backupMethodInBaseClass = class_getInstanceMethod(baseClass, backupSel);
+    method_setImplementation(originalMethod, method_getImplementation(backupMethodInBaseClass));
 }
 
 QT_END_NAMESPACE