From 178f94a271da522f7981563e962646536eb43b4c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 10 Jan 2022 12:07:57 +0530 Subject: [PATCH] Dont link rcc_backend against qtgui --- setup/build.py | 4 ++-- setup/extensions.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/build.py b/setup/build.py index d88f9b83c8..498acd3770 100644 --- a/setup/build.py +++ b/setup/build.py @@ -41,7 +41,7 @@ class Extension: self.headers = d['headers'] = absolutize(kwargs.get('headers', [])) self.sip_files = d['sip_files'] = absolutize(kwargs.get('sip_files', [])) 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.lib_dirs = d['lib_dirs'] = absolutize(kwargs.get('lib_dirs', [])) self.extra_objs = d['extra_objs'] = absolutize(kwargs.get('extra_objs', [])) @@ -530,7 +530,7 @@ headers = {ext.headers} sources = {ext.sources} exceptions = {needs_exceptions} include-dirs = {ext.inc_dirs} -qmake-QT = ["{ext.qt_project_type}"] +qmake-QT = {ext.qt_modules} sip-file = "{os.path.basename(sipf)}" ''') shutil.copy2(sipf, src_dir) diff --git a/setup/extensions.json b/setup/extensions.json index 456e4320ce..692e5d209c 100644 --- a/setup/extensions.json +++ b/setup/extensions.json @@ -137,7 +137,7 @@ "headers": "calibre/gui2/rcc/rcc.h", "sip_files": "calibre/gui2/rcc/rcc.sip", "inc_dirs": "calibre/gui2/rcc", - "qt_project_type": "core" + "qt_modules": ["-gui"] }, { "name": "pictureflow",