Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont link rcc_backend against qtgui

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-10 12:07:57 +05:30
parent a0e1c7b7e3
commit 178f94a271
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/build.py
View File

@ -41,7 +41,7 @@ class Extension:
self.headers = d['headers'] = absolutize(kwargs.get('headers', [])) self.headers = d['headers'] = absolutize(kwargs.get('headers', []))
self.sip_files = d['sip_files'] = absolutize(kwargs.get('sip_files', [])) self.sip_files = d['sip_files'] = absolutize(kwargs.get('sip_files', []))
self.needs_exceptions = d['needs_exceptions'] = kwargs.get('needs_exceptions', False) self.needs_exceptions = d['needs_exceptions'] = kwargs.get('needs_exceptions', False)
self.qt_project_type = d['qt_project_type'] = kwargs.get('qt_project_type', "widgets") self.qt_modules = d['qt_modules'] = kwargs.get('qt_modules', ["widgets"])
self.inc_dirs = d['inc_dirs'] = absolutize(kwargs.get('inc_dirs', [])) self.inc_dirs = d['inc_dirs'] = absolutize(kwargs.get('inc_dirs', []))
self.lib_dirs = d['lib_dirs'] = absolutize(kwargs.get('lib_dirs', [])) self.lib_dirs = d['lib_dirs'] = absolutize(kwargs.get('lib_dirs', []))
self.extra_objs = d['extra_objs'] = absolutize(kwargs.get('extra_objs', [])) self.extra_objs = d['extra_objs'] = absolutize(kwargs.get('extra_objs', []))
@ -530,7 +530,7 @@ headers = {ext.headers}
sources = {ext.sources} sources = {ext.sources}
exceptions = {needs_exceptions} exceptions = {needs_exceptions}
include-dirs = {ext.inc_dirs} include-dirs = {ext.inc_dirs}
qmake-QT = ["{ext.qt_project_type}"] qmake-QT = {ext.qt_modules}
sip-file = "{os.path.basename(sipf)}" sip-file = "{os.path.basename(sipf)}"
''') ''')
shutil.copy2(sipf, src_dir) shutil.copy2(sipf, src_dir)

2
setup/extensions.json
View File

@ -137,7 +137,7 @@
"headers": "calibre/gui2/rcc/rcc.h", "headers": "calibre/gui2/rcc/rcc.h",
"sip_files": "calibre/gui2/rcc/rcc.sip", "sip_files": "calibre/gui2/rcc/rcc.sip",
"inc_dirs": "calibre/gui2/rcc", "inc_dirs": "calibre/gui2/rcc",
"qt_project_type": "core" "qt_modules": ["-gui"]
}, },
{ {
"name": "pictureflow", "name": "pictureflow",