Attachment 218632 Details for Bug 250235 – svn diff to update the patch to build with qt>=5.15.0

[patch] svn diff to update the patch to build with qt>=5.15.0

qt5-style-plugins-5.0.0.23_9.diff (text/plain), 2.50 KB, created by Marcel Kaiser on 2020-10-09 21:13:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel Kaiser

Created: 2020-10-09 21:13:22 UTC

Size: 2.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 550503)
>+++ Makefile	(working copy)
>@@ -5,7 +5,7 @@
> DISTVERSIONPREFIX=	v
> DISTVERSION=	5.0.0-23
> DISTVERSIONSUFFIX=	-g335dbe
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	x11-themes
> DIST_SUBDIR=	KDE/Qt/addons
> 
>Index: files/patch-fix_build_against_qt5.15
>===================================================================
>--- files/patch-fix_build_against_qt5.15	(revision 550503)
>+++ files/patch-fix_build_against_qt5.15	(working copy)
>@@ -6,28 +6,25 @@
> With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application
> palette handling between QGuiApplication and QApplication")
> QApplicationPrivate::setSystemPalette is no longer used and necessary.
>----
>- src/plugins/styles/gtk2/qgtkstyle.cpp   | 2 ++
>- src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
>- 2 files changed, 4 insertions(+)
>-
>-diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
>-index 36169c9..2544593 100644
>---- src/plugins/styles/gtk2/qgtkstyle.cpp
>+--- src/plugins/styles/gtk2/qgtkstyle.cpp.orig	2017-03-11 09:23:02 UTC
> +++ src/plugins/styles/gtk2/qgtkstyle.cpp
>-@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app)
>+@@ -440,7 +440,11 @@ void QGtkStyle::polish(QApplication *app)
>      // not supported as these should be entirely determined by
>      // current Gtk settings
>      if (app->desktopSettingsAware() && d->isThemeAvailable()) {
> +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
>          QApplicationPrivate::setSystemPalette(standardPalette());
>++#else
>++        QApplication::setPalette(standardPalette());
> +#endif
>          QApplicationPrivate::setSystemFont(d->getThemeFont());
>          d->applyCustomPaletteHash();
>          if (!d->isKDE4Session())
>-diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
>-index e57b3d8..e71beb0 100644
>---- src/plugins/styles/gtk2/qgtkstyle_p.cpp
>+ src/plugins/styles/gtk2/qgtkstyle.cpp   | 2 ++
>+ src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
>+ 2 files changed, 4 insertions(+)
>+
>+--- src/plugins/styles/gtk2/qgtkstyle_p.cpp.orig	2017-03-11 09:23:02 UTC
> +++ src/plugins/styles/gtk2/qgtkstyle_p.cpp
> @@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme()
>        if (oldTheme != QGtkStylePrivate::getThemeName()) {
>@@ -39,5 +36,3 @@
>            QApplication::setPalette(newPalette);
>            if (!QGtkStylePrivate::instances.isEmpty()) {
>                QGtkStylePrivate::instances.last()->initGtkWidgets();
>--- 
>-2.26.2

Actions: View | Diff

Attachments on bug 250235: 218632