From 1641a23c4e8790bf348a51d39b2ff3ca176448e9 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 4 Aug 2021 23:40:14 +0200 Subject: [PATCH 1/3] GIT_SILENT Upgrade release service version to 21.08.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f134aa10..e06e9e9ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.16) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "21") -set (RELEASE_SERVICE_VERSION_MINOR "07") -set (RELEASE_SERVICE_VERSION_MICRO "90") +set (RELEASE_SERVICE_VERSION_MINOR "08") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(okular VERSION ${RELEASE_SERVICE_VERSION}) From bf0642bfcb28ba6b711a8db905a2e07b3d6a70a3 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 4 Aug 2021 23:53:58 +0200 Subject: [PATCH 2/3] GIT_SILENT Update Appstream for new release --- generators/chm/org.kde.okular-chm.metainfo.xml | 2 +- generators/comicbook/org.kde.okular-comicbook.metainfo.xml | 2 +- generators/djvu/org.kde.okular-djvu.metainfo.xml | 2 +- generators/dvi/org.kde.okular-dvi.metainfo.xml | 2 +- generators/epub/org.kde.okular-epub.metainfo.xml | 2 +- generators/fax/org.kde.okular-fax.metainfo.xml | 2 +- generators/fictionbook/org.kde.okular-fb.metainfo.xml | 2 +- generators/kimgio/org.kde.okular-kimgio.metainfo.xml | 2 +- generators/markdown/org.kde.okular-md.metainfo.xml | 2 +- generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml | 2 +- generators/plucker/org.kde.okular-plucker.metainfo.xml | 2 +- generators/poppler/org.kde.okular-poppler.metainfo.xml | 2 +- generators/spectre/org.kde.okular-spectre.metainfo.xml | 2 +- generators/tiff/org.kde.okular-tiff.metainfo.xml | 2 +- generators/txt/org.kde.okular-txt.metainfo.xml | 2 +- generators/xps/org.kde.okular-xps.metainfo.xml | 2 +- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- shell/org.kde.okular.appdata.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/generators/chm/org.kde.okular-chm.metainfo.xml b/generators/chm/org.kde.okular-chm.metainfo.xml index 1398afd3a..9cb61e812 100644 --- a/generators/chm/org.kde.okular-chm.metainfo.xml +++ b/generators/chm/org.kde.okular-chm.metainfo.xml @@ -89,9 +89,9 @@ https://okular.kde.org + - diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml index 806cdde9f..7d0275508 100644 --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -92,9 +92,9 @@ https://okular.kde.org + - diff --git a/generators/djvu/org.kde.okular-djvu.metainfo.xml b/generators/djvu/org.kde.okular-djvu.metainfo.xml index 2478f4937..f786a08db 100644 --- a/generators/djvu/org.kde.okular-djvu.metainfo.xml +++ b/generators/djvu/org.kde.okular-djvu.metainfo.xml @@ -89,9 +89,9 @@ https://okular.kde.org + - diff --git a/generators/dvi/org.kde.okular-dvi.metainfo.xml b/generators/dvi/org.kde.okular-dvi.metainfo.xml index b950ba976..cc95e3981 100644 --- a/generators/dvi/org.kde.okular-dvi.metainfo.xml +++ b/generators/dvi/org.kde.okular-dvi.metainfo.xml @@ -91,9 +91,9 @@ https://okular.kde.org + - diff --git a/generators/epub/org.kde.okular-epub.metainfo.xml b/generators/epub/org.kde.okular-epub.metainfo.xml index 077ac1af7..54fc1bd19 100644 --- a/generators/epub/org.kde.okular-epub.metainfo.xml +++ b/generators/epub/org.kde.okular-epub.metainfo.xml @@ -89,9 +89,9 @@ https://okular.kde.org + - diff --git a/generators/fax/org.kde.okular-fax.metainfo.xml b/generators/fax/org.kde.okular-fax.metainfo.xml index ed9703bef..8fcf490c5 100644 --- a/generators/fax/org.kde.okular-fax.metainfo.xml +++ b/generators/fax/org.kde.okular-fax.metainfo.xml @@ -90,9 +90,9 @@ https://okular.kde.org + - diff --git a/generators/fictionbook/org.kde.okular-fb.metainfo.xml b/generators/fictionbook/org.kde.okular-fb.metainfo.xml index 69e6ef8a4..b899b4e7c 100644 --- a/generators/fictionbook/org.kde.okular-fb.metainfo.xml +++ b/generators/fictionbook/org.kde.okular-fb.metainfo.xml @@ -89,9 +89,9 @@ https://okular.kde.org + - diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index 6bfa2d4c7..1c492443c 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -112,9 +112,9 @@ https://okular.kde.org + - diff --git a/generators/markdown/org.kde.okular-md.metainfo.xml b/generators/markdown/org.kde.okular-md.metainfo.xml index 4fed39d04..bc5edd3f2 100644 --- a/generators/markdown/org.kde.okular-md.metainfo.xml +++ b/generators/markdown/org.kde.okular-md.metainfo.xml @@ -87,9 +87,9 @@ https://okular.kde.org + - diff --git a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml index 35ac3f6ac..89d177906 100644 --- a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml +++ b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml @@ -112,9 +112,9 @@ https://okular.kde.org + - diff --git a/generators/plucker/org.kde.okular-plucker.metainfo.xml b/generators/plucker/org.kde.okular-plucker.metainfo.xml index 5875fddfe..98b50d298 100644 --- a/generators/plucker/org.kde.okular-plucker.metainfo.xml +++ b/generators/plucker/org.kde.okular-plucker.metainfo.xml @@ -89,9 +89,9 @@ https://okular.kde.org + - diff --git a/generators/poppler/org.kde.okular-poppler.metainfo.xml b/generators/poppler/org.kde.okular-poppler.metainfo.xml index b5820d35a..55e450b22 100644 --- a/generators/poppler/org.kde.okular-poppler.metainfo.xml +++ b/generators/poppler/org.kde.okular-poppler.metainfo.xml @@ -92,9 +92,9 @@ https://okular.kde.org + - diff --git a/generators/spectre/org.kde.okular-spectre.metainfo.xml b/generators/spectre/org.kde.okular-spectre.metainfo.xml index 690159cf4..a7368598b 100644 --- a/generators/spectre/org.kde.okular-spectre.metainfo.xml +++ b/generators/spectre/org.kde.okular-spectre.metainfo.xml @@ -96,9 +96,9 @@ https://okular.kde.org + - diff --git a/generators/tiff/org.kde.okular-tiff.metainfo.xml b/generators/tiff/org.kde.okular-tiff.metainfo.xml index e1d46125d..6e74434ac 100644 --- a/generators/tiff/org.kde.okular-tiff.metainfo.xml +++ b/generators/tiff/org.kde.okular-tiff.metainfo.xml @@ -89,9 +89,9 @@ https://okular.kde.org + - diff --git a/generators/txt/org.kde.okular-txt.metainfo.xml b/generators/txt/org.kde.okular-txt.metainfo.xml index 3262cc0b1..40645d604 100644 --- a/generators/txt/org.kde.okular-txt.metainfo.xml +++ b/generators/txt/org.kde.okular-txt.metainfo.xml @@ -88,9 +88,9 @@ https://okular.kde.org + - diff --git a/generators/xps/org.kde.okular-xps.metainfo.xml b/generators/xps/org.kde.okular-xps.metainfo.xml index 67cf48a20..686636fbd 100644 --- a/generators/xps/org.kde.okular-xps.metainfo.xml +++ b/generators/xps/org.kde.okular-xps.metainfo.xml @@ -89,9 +89,9 @@ https://okular.kde.org + - diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 5f75b6574..908d29f52 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -297,9 +297,9 @@ okularkirigami + - diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 7b04620c7..75a2c9d06 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -337,9 +337,9 @@ 251 + - From 4afd21470147dd7b20f21e8edf20e5f350f98df3 Mon Sep 17 00:00:00 2001 From: David Hurka Date: Fri, 6 Aug 2021 13:52:37 +0200 Subject: [PATCH 3/3] ToggleActionMenu::createWidget(): Do not crash if parent is not a QToolBar There used to be a Q_ASSERT_X that was triggered when a widget was requested with something else than a QToolBar as parent widget. However, when the ToggleActionMenu is added to a QMenu, createWidget() is called with the QMenu as parent. This case was missed to be tested, but occurs when the toolbar is detached/moved by the user. --- part/toggleactionmenu.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/part/toggleactionmenu.cpp b/part/toggleactionmenu.cpp index 03977b217..0ccff3fb2 100644 --- a/part/toggleactionmenu.cpp +++ b/part/toggleactionmenu.cpp @@ -35,11 +35,9 @@ QWidget *ToggleActionMenu::createWidget(QWidget *parent) QToolButton *button = qobject_cast(buttonWidget); if (!button) { // This function is used to add a button into the toolbar. - // KActionMenu will plug itself as QToolButton. - // So, if no QToolButton was returned, this was not called the intended way. - Q_ASSERT_X(false, - "ToggleActionMenu::createWidget()", - "Parent implementation KActionMenu::createWidget() did not return a QToolButton, but ToggleActionMenu is designed for QToolButton. Did you call createWidget() manually, with something else than a QToolBar?"); + // QWidgetAction::createWidget() is also called with other parents, + // e. g. when this ToggleActionMenu is added to a QMenu. + // Therefore, reaching this code path is a valid use case. return buttonWidget; }