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

Qt windows extras are removed

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-22 10:16:23 +05:30
parent 30761d8a4d
commit 950f6bfb24
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
6 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bypy/init_env.py
View File

@ -96,9 +96,6 @@ PYQT_MODULES = (
) )
del dlls del dlls
if iswindows:
PYQT_MODULES += ('QtWinExtras',)
def read_cal_file(name): def read_cal_file(name):
with open(os.path.join(CALIBRE_DIR, 'src', 'calibre', name), 'rb') as f: with open(os.path.join(CALIBRE_DIR, 'src', 'calibre', name), 'rb') as f:

8
bypy/sources.json
View File

@ -499,14 +499,6 @@
} }
}, },
{
"name": "qt-winextras",
"os": "windows",
"hashes": {
"unix": "sha256:65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e"
}
},
{ {
"name": "qt-webengine", "name": "qt-webengine",

3
src/calibre/test_build.py
View File

@ -324,9 +324,6 @@ class BuildTest(unittest.TestCase):
create_cover('xxx', ['yyy']) create_cover('xxx', ['yyy'])
na = QNetworkAccessManager() na = QNetworkAccessManager()
self.assertTrue(hasattr(na, 'sslErrors'), 'Qt not compiled with openssl') self.assertTrue(hasattr(na, 'sslErrors'), 'Qt not compiled with openssl')
if iswindows:
from qt.core import QtWin
QtWin
p = QWebEnginePage() p = QWebEnginePage()
def callback(result): def callback(result):

4
src/calibre/utils/open_with/windows.py
View File

@ -6,7 +6,7 @@ __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import re import re
import sys import sys
from qt.core import QBuffer, QByteArray, QPixmap, Qt, QtWin, QIODevice from qt.core import QBuffer, QByteArray, QImage, QIODevice, QPixmap, Qt
from calibre.gui2 import must_use_qt from calibre.gui2 import must_use_qt
from calibre.utils.winreg.default_programs import split_commandline from calibre.utils.winreg.default_programs import split_commandline
@ -16,7 +16,7 @@ ICON_SIZE = 256
def hicon_to_pixmap(hicon): def hicon_to_pixmap(hicon):
return QtWin.fromHICON(int(hicon)) QPixmap.fromImage(QImage.fromHICON(int(hicon)))
def pixmap_to_data(pixmap): def pixmap_to_data(pixmap):

1
src/qt/__main__.py
View File

@ -44,7 +44,6 @@ def scan(name):
module_names += ('sip',) module_names += ('sip',)
mod = importlib.import_module(f'{QT_WRAPPER}.sip') mod = importlib.import_module(f'{QT_WRAPPER}.sip')
name_map['sip'] = mod.__name__ name_map['sip'] = mod.__name__
name_map['QtWin'] = f'{QT_WRAPPER}.QtWinExtras'
with open(f'{base}/{name}_name_map.py', 'w') as f: with open(f'{base}/{name}_name_map.py', 'w') as f:
print('# autogenerated by __main__.py do not edit', file=f) print('# autogenerated by __main__.py do not edit', file=f)
print('name_map =', end=' ', file=f) print('name_map =', end=' ', file=f)

1
src/qt/core_name_map.py
View File

@ -579,7 +579,6 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore',
'QtPrintSupport': 'PyQt6.QtPrintSupport', 'QtPrintSupport': 'PyQt6.QtPrintSupport',
'QtSvg': 'PyQt6.QtSvg', 'QtSvg': 'PyQt6.QtSvg',
'QtWidgets': 'PyQt6.QtWidgets', 'QtWidgets': 'PyQt6.QtWidgets',
'QtWin': 'PyQt6.QtWinExtras',
'pyqtBoundSignal': 'PyQt6.QtCore', 'pyqtBoundSignal': 'PyQt6.QtCore',
'pyqtClassInfo': 'PyQt6.QtCore', 'pyqtClassInfo': 'PyQt6.QtCore',
'pyqtEnum': 'PyQt6.QtCore', 'pyqtEnum': 'PyQt6.QtCore',