diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py
index 44bd8381f4..b146a82e28 100644
--- a/setup/installer/osx/app/main.py
+++ b/setup/installer/osx/app/main.py
@@ -335,10 +335,9 @@ class Py2App(object):
         self.set_id(lib, self.FID+'/'+rpath)
         self.fix_dependencies_in_lib(lib)
         # The following is needed for codesign in OS X >= 10.9.5
-        # See https://bugreports.qt-project.org/browse/QTBUG-32895
+        # The presence of the .prl file in the root of the framework causes
+        # codesign to fail.
         with current_dir(dest):
-            os.rename('Contents', 'Versions/Current/Resources')
-            os.symlink('Versions/Current/Resources', 'Resources')
             for x in os.listdir('.'):
                 if x != 'Versions' and not os.path.islink(x):
                     os.remove(x)
diff --git a/setup/qt-workarounds.txt b/setup/qt-workarounds.txt
index 4957a3709c..58898a6fd5 100644
--- a/setup/qt-workarounds.txt
+++ b/setup/qt-workarounds.txt
@@ -1,11 +1,2 @@
 Undo manual patching for webkit soft hyphen rendering bug when using qt
 >= 5.4.0
-
-Undo manual patching for OS X search box keyboard focus when using Qt >=
-5.3.2
-
-Undo manual fixing of Qt framework bundles in OS X setup script when
-using Qt >= 5.3.3
-
-Undo manual filtering of Cmd+letter in edit book editor/text.py when
-using Qt >= 5.4.0 (QTBUG-36281)
diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py
index 2170ef36d8..e9c90fc236 100644
--- a/src/calibre/gui2/tweak_book/editor/text.py
+++ b/src/calibre/gui2/tweak_book/editor/text.py
@@ -14,10 +14,9 @@ import regex
 from PyQt5.Qt import (
     QPlainTextEdit, QFontDatabase, QToolTip, QPalette, QFont, QKeySequence,
     QTextEdit, QTextFormat, QWidget, QSize, QPainter, Qt, QRect, QColor,
-    QColorDialog, QTimer, pyqtSignal, QT_VERSION)
+    QColorDialog, QTimer, pyqtSignal)
 
 from calibre import prepare_string_for_xml
-from calibre.constants import isosx
 from calibre.gui2.tweak_book import tprefs, TOP
 from calibre.gui2.tweak_book.completion.popup import CompletionPopup
 from calibre.gui2.tweak_book.editor import (
@@ -717,11 +716,6 @@ class TextEdit(PlainTextEdit):
             self.setOverwriteMode(self.overwriteMode() ^ True)
             ev.accept()
             return
-        if isosx and QT_VERSION < 0x504000 and ev.modifiers() == Qt.ControlModifier and re.search(r'[a-zA-Z0-9]+', ev.text()) is not None:
-            # For some reason Qt 5 translates Cmd+key into text on OS X
-            # https://bugreports.qt-project.org/browse/QTBUG-36281
-            ev.setAccepted(False)
-            return
         if self.snippet_manager.handle_key_press(ev):
             self.completion_popup.hide()
             return