diff options
Diffstat (limited to '')
-rw-r--r-- | devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro | 4 | ||||
-rw-r--r-- | devel/qt5-qdoc/files/patch-src_src.pro | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro b/devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro index 48f42f0aac7c..8bfb219ac8aa 100644 --- a/devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro +++ b/devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro @@ -1,6 +1,6 @@ ---- src/qdoc/qdoc.pro.orig 2019-12-31 21:11:48 UTC +--- src/qdoc/qdoc.pro.orig 2020-08-24 09:20:54 UTC +++ src/qdoc/qdoc.pro -@@ -152,6 +152,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_ +@@ -158,6 +158,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_ QMAKE_SUBSTITUTES += cmake_qdoc_config_file cmake_qdoc_config_version_file cmake_qdoc_tools_files.files += $$cmake_qdoc_config_file.output $$cmake_qdoc_config_version_file.output diff --git a/devel/qt5-qdoc/files/patch-src_src.pro b/devel/qt5-qdoc/files/patch-src_src.pro index 04218543f727..e2c7ee30c1a4 100644 --- a/devel/qt5-qdoc/files/patch-src_src.pro +++ b/devel/qt5-qdoc/files/patch-src_src.pro @@ -1,9 +1,9 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2019-02-14 20:14:11 UTC +--- src/src.pro.orig 2020-11-20 20:20:35 UTC +++ src/src.pro -@@ -1,54 +1,5 @@ +@@ -1,55 +1,5 @@ TEMPLATE = subdirs -qtHaveModule(widgets) { @@ -12,10 +12,11 @@ missing dependencies. - } else { - QT_FOR_CONFIG += widgets - qtConfig(pushbutton):qtConfig(toolbutton) { -- SUBDIRS = assistant \ -- designer \ +- SUBDIRS = designer \ - pixeltool - +- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant +- - linguist.depends = designer - } - qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator |