Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to Qt 5.4.1 for the OS X build

Browse Source
This commit is contained in:
Kovid Goyal 2015-03-24 12:45:04 +05:30
parent d9cc928730
commit e5e8c8600a
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/installer/osx/app/main.py
View File

@ -335,10 +335,9 @@ class Py2App(object):
self.set_id(lib, self.FID+'/'+rpath) self.set_id(lib, self.FID+'/'+rpath)
self.fix_dependencies_in_lib(lib) self.fix_dependencies_in_lib(lib)
# The following is needed for codesign in OS X >= 10.9.5 # 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): with current_dir(dest):
os.rename('Contents', 'Versions/Current/Resources')
os.symlink('Versions/Current/Resources', 'Resources')
for x in os.listdir('.'): for x in os.listdir('.'):
if x != 'Versions' and not os.path.islink(x): if x != 'Versions' and not os.path.islink(x):
os.remove(x) os.remove(x)

9
setup/qt-workarounds.txt
View File

@ -1,11 +1,2 @@
Undo manual patching for webkit soft hyphen rendering bug when using qt Undo manual patching for webkit soft hyphen rendering bug when using qt
>= 5.4.0 >= 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)

8
src/calibre/gui2/tweak_book/editor/text.py
View File

@ -14,10 +14,9 @@ import regex
from PyQt5.Qt import ( from PyQt5.Qt import (
QPlainTextEdit, QFontDatabase, QToolTip, QPalette, QFont, QKeySequence, QPlainTextEdit, QFontDatabase, QToolTip, QPalette, QFont, QKeySequence,
QTextEdit, QTextFormat, QWidget, QSize, QPainter, Qt, QRect, QColor, 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 import prepare_string_for_xml
from calibre.constants import isosx
from calibre.gui2.tweak_book import tprefs, TOP from calibre.gui2.tweak_book import tprefs, TOP
from calibre.gui2.tweak_book.completion.popup import CompletionPopup from calibre.gui2.tweak_book.completion.popup import CompletionPopup
from calibre.gui2.tweak_book.editor import ( from calibre.gui2.tweak_book.editor import (
@ -717,11 +716,6 @@ class TextEdit(PlainTextEdit):
self.setOverwriteMode(self.overwriteMode() ^ True) self.setOverwriteMode(self.overwriteMode() ^ True)
ev.accept() ev.accept()
return 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): if self.snippet_manager.handle_key_press(ev):
self.completion_popup.hide() self.completion_popup.hide()
return return