Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6gtk2 for openSUSE:Leap:16.0 checked in at 2025-04-23 09:12:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:16.0/qt6gtk2 (Old) and /work/SRC/openSUSE:Leap:16.0/.qt6gtk2.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6gtk2" Wed Apr 23 09:12:12 2025 rev:2 rq:1271568 version:0.4 Changes: -------- --- /work/SRC/openSUSE:Leap:16.0/qt6gtk2/qt6gtk2.changes 2025-03-19 11:56:04.817277272 +0100 +++ /work/SRC/openSUSE:Leap:16.0/.qt6gtk2.new.30101/qt6gtk2.changes 2025-04-23 09:12:12.758610752 +0200 @@ -1,0 +2,9 @@ +Tue Mar 11 10:10:32 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 0.4 + * Added Qt 6.9 support + * Moved home page to opencode.net + * Increased minimum Qt version to 6.2 + * Refactoring + +------------------------------------------------------------------- Old: ---- qt6gtk2-0.3.tar.xz New: ---- qt6gtk2-0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6gtk2.spec ++++++ --- /var/tmp/diff_new_pack.Lwd6cA/_old 2025-04-23 09:12:13.030622119 +0200 +++ /var/tmp/diff_new_pack.Lwd6cA/_new 2025-04-23 09:12:13.030622119 +0200 @@ -17,12 +17,12 @@ %define qt_version 6.0.0 Name: qt6gtk2 -Version: 0.3 +Version: 0.4 Release: 0 Summary: Qt6 Gtk2 Style Plugin License: GPL-2.0-or-later -URL: https://github.com/trialuser02/qt6gtk2 -Source: https://github.com/trialuser02/qt6gtk2/releases/download/%{version}/%{name}-%{version}.tar.xz +URL: https://www.opencode.net/trialuser/qt6gtk2 +Source: https://www.opencode.net/trialuser/qt6gtk2/-/archive/%{version}/qt6gtk2-%{version}.tar.bz2 BuildRequires: qt6-core-private-devel >= %{qt_version} BuildRequires: qt6-gui-private-devel >= %{qt_version} BuildRequires: qt6-widgets-private-devel >= %{qt_version} ++++++ qt6gtk2-0.3.tar.xz -> qt6gtk2-0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/AUTHORS new/qt6gtk2-0.4/AUTHORS --- old/qt6gtk2-0.3/AUTHORS 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/AUTHORS 2025-03-04 17:25:32.000000000 +0100 @@ -1,2 +1,2 @@ The Qt Company Ltd. -Ilya Kotov <forkoro...@ya.ru>, <ioko...@astralinux.ru>, <trialuse...@gmail.com> +Ilya Kotov <forkoro...@ya.ru>, <trialuse...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/ChangeLog new/qt6gtk2-0.4/ChangeLog --- old/qt6gtk2-0.3/ChangeLog 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/ChangeLog 2025-03-04 17:25:32.000000000 +0100 @@ -1,15 +1,22 @@ Changelog of Qt6Gtk2 ---------- -Version 0.1 -* inital release -Version 0.2 -* Added Qt version checking -* Added preview support to the file dialog (Ilya Fedin) -* Added "gtk2" platform theme key (lvlgl) +Version 0.4 +* Added Qt 6.9 support +* Moved home page to opencode.net +* Increased minimum Qt version to 6.2 +* Refactoring Version 0.3 * Added Qt 6.8 support * Fixed dock widget buttons size for Qt 6.7 or higher * Improved GTK settings support (patch by Alexei Sorokin) + +Version 0.2 +* Added Qt version checking +* Added preview support to the file dialog (Ilya Fedin) +* Added "gtk2" platform theme key (lvlgl) + +Version 0.1 +* inital release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/README.md new/qt6gtk2-0.4/README.md --- old/qt6gtk2-0.3/README.md 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/README.md 2025-03-04 17:25:32.000000000 +0100 @@ -1,11 +1,11 @@ Qt6Gtk2 - GTK+2.0 integration plugins for Qt6 -Official home page: https://github.com/trialuser02/qt6gtk2 +Official home page: https://www.opencode.net/trialuser/qt6gtk2 Requirements: - GNU Linux or FreeBSD -- qtbase >= 6.0.0 (with private headers) +- qtbase >= 6.2.0 (with private headers) - GTK+ 2.0 - libX11 @@ -16,7 +16,7 @@ - Source Code ``` - qmake PREFIX=<your installation path> + qmake6 PREFIX=<your installation path> make sudo make install ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/qt6gtk2.pri new/qt6gtk2-0.4/qt6gtk2.pri --- old/qt6gtk2-0.3/qt6gtk2.pri 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/qt6gtk2.pri 2025-03-04 17:25:32.000000000 +0100 @@ -5,8 +5,8 @@ RCC_DIR=./.build/rcc CONFIG += hide_symbols c++17 -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 -DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS QT_NO_FOREACH QT_DEPRECATED_WARNINGS +DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS QT_NO_FOREACH QT_MESSAGELOGCONTEXT +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060200 QT_DEPRECATED_WARNINGS QT_NO_CAST_FROM_ASCII QMAKE_DISTCLEAN += -r .build #*-g++ { @@ -14,8 +14,8 @@ # QMAKE_CXXFLAGS += -Wzero-as-null-pointer-constant #} -!isEqual (QT_MAJOR_VERSION, 6) { - error("Use Qt 6.0.0 or higher.") +!isEqual(QT_MAJOR_VERSION, 6)|!greaterThan(QT_MINOR_VERSION, 1) { + error("Use Qt 6.2.0 or higher.") } #Install paths diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/main.cpp new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/main.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/main.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/main.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.cpp new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -99,8 +99,8 @@ } else { // block input to the window, allow input to other GTK dialogs QEventLoop loop; - connect(this, SIGNAL(accept()), &loop, SLOT(quit())); - connect(this, SIGNAL(reject()), &loop, SLOT(quit())); + connect(this, &QGtk2Dialog::accept, &loop, &QEventLoop::quit); + connect(this, &QGtk2Dialog::reject, &loop, &QEventLoop::quit); loop.exec(); } } @@ -154,8 +154,8 @@ Qt6Gtk2ColorDialogHelper::Qt6Gtk2ColorDialogHelper() { d.reset(new QGtk2Dialog(gtk_color_selection_dialog_new(""))); - connect(d.data(), SIGNAL(accept()), this, SLOT(onAccepted())); - connect(d.data(), SIGNAL(reject()), this, SIGNAL(reject())); + connect(d.data(), &QGtk2Dialog::accept, this, &Qt6Gtk2ColorDialogHelper::onAccepted); + connect(d.data(), &QGtk2Dialog::reject, this, &Qt6Gtk2ColorDialogHelper::reject); GtkWidget *gtkColorSelection = gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(d->gtkDialog())); g_signal_connect_swapped(gtkColorSelection, "color-changed", G_CALLBACK(onColorChanged), this); @@ -243,8 +243,8 @@ GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, nullptr))); - connect(d.data(), SIGNAL(accept()), this, SLOT(onAccepted())); - connect(d.data(), SIGNAL(reject()), this, SIGNAL(reject())); + connect(d.data(), &QGtk2Dialog::accept, this, &Qt6Gtk2FileDialogHelper::onAccepted); + connect(d.data(), &QGtk2Dialog::reject, this, &Qt6Gtk2FileDialogHelper::reject); g_signal_connect(GTK_FILE_CHOOSER(d->gtkDialog()), "selection-changed", G_CALLBACK(onSelectionChanged), this); g_signal_connect_swapped(GTK_FILE_CHOOSER(d->gtkDialog()), "current-folder-changed", G_CALLBACK(onCurrentFolderChanged), this); @@ -400,7 +400,7 @@ // Don't attempt to open anything which isn't a regular file. If a named pipe, // this may hang. - QFileInfo fileinfo(filename); + QFileInfo fileinfo(QString::fromLocal8Bit(filename)); if (!fileinfo.exists() || !fileinfo.isFile()) { g_free(filename); gtk_file_chooser_set_preview_widget_active(GTK_FILE_CHOOSER(gtkDialog), false); @@ -408,7 +408,7 @@ } // This will preserve the image's aspect ratio. - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size(filename, PREVIEW_WIDTH, PREVIEW_HEIGHT, 0); + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size(filename, PREVIEW_WIDTH, PREVIEW_HEIGHT, nullptr); g_free(filename); if (pixbuf) { gtk_image_set_from_pixbuf(GTK_IMAGE(helper->previewWidget), pixbuf); @@ -518,8 +518,8 @@ Qt6Gtk2FontDialogHelper::Qt6Gtk2FontDialogHelper() { d.reset(new QGtk2Dialog(gtk_font_selection_dialog_new(""))); - connect(d.data(), SIGNAL(accept()), this, SLOT(onAccepted())); - connect(d.data(), SIGNAL(reject()), this, SIGNAL(reject())); + connect(d.data(), &QGtk2Dialog::accept, this, &Qt6Gtk2FontDialogHelper::onAccepted); + connect(d.data(), &QGtk2Dialog::reject, this, &Qt6Gtk2FontDialogHelper::reject); } Qt6Gtk2FontDialogHelper::~Qt6Gtk2FontDialogHelper() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.h new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.h --- old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2dialoghelpers.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2theme.cpp new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2theme.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2theme.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2theme.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -86,8 +86,7 @@ return gtkSetting("gtk-fallback-icon-theme"); case QPlatformTheme::StyleNames: { - QStringList styleNames; - styleNames << "qt6gtk2"; + QStringList styleNames = { QStringLiteral("qt6gtk2") }; //styleNames << QGnomeTheme::themeHint(hint).toStringList(); return styleNames; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2theme.h new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2theme.h --- old/qt6gtk2-0.3/src/qt6gtk2-qtplugin/qt6gtk2theme.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-qtplugin/qt6gtk2theme.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/plugin.cpp new/qt6gtk2-0.4/src/qt6gtk2-style/plugin.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-style/plugin.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/plugin.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -42,7 +42,7 @@ return nullptr; } - if (key == "gtk2" || key == "qt6gtk2" || key == "qt5gtk2") + if (key == QLatin1String("gtk2") || key == QLatin1String("qt6gtk2") || key == QLatin1String("qt5gtk2")) return new QGtkStyle; return nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtk2painter.cpp new/qt6gtk2-0.4/src/qt6gtk2-style/qgtk2painter.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtk2painter.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtk2painter.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtk2painter_p.h new/qt6gtk2-0.4/src/qt6gtk2-style/qgtk2painter_p.h --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtk2painter_p.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtk2painter_p.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkglobal_p.h new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkglobal_p.h --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkglobal_p.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkglobal_p.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkpainter.cpp new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkpainter.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkpainter.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkpainter.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkpainter_p.h new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkpainter_p.h --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkpainter_p.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkpainter_p.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle.cpp new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -1806,8 +1806,14 @@ // and http://live.gnome.org/GnomeArt/Tutorials/GtkThemes/GtkComboBoxEntry if (const QStyleOptionComboBox *comboBox = qstyleoption_cast<const QStyleOptionComboBox *>(option)) { bool sunken = comboBox->state & State_On; // play dead, if combobox has no items + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + QCachedPainter p(painter, QStringLiteral("cb-%0-%1").arg(sunken).arg(comboBox->editable), option); + gtkPainter->reset(painter); +#else BEGIN_STYLE_PIXMAPCACHE(QString::fromLatin1("cb-%0-%1").arg(sunken).arg(comboBox->editable)); gtkPainter->reset(p); +#endif gtkPainter->setUsePixmapCache(false); // cached externally bool isEnabled = (comboBox->state & State_Enabled); @@ -2004,7 +2010,11 @@ style, arrowPath.toString() + QString::number(option->direction)); } } - END_STYLE_PIXMAPCACHE; +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + p.finish(); +#else + END_STYLE_PIXMAPCACHE +#endif } break; #endif // QT_NO_COMBOBOX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle_p.cpp new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle_p.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle_p.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle_p.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -286,7 +286,7 @@ if (!gtkWidgetMap()->contains("GtkButton")) { GtkWidget *gtkButton = gtk_button_new(); addWidget(gtkButton); - g_signal_connect(gtkButton, "style-set", G_CALLBACK(gtkStyleSetCallback), 0); + g_signal_connect(gtkButton, "style-set", G_CALLBACK(gtkStyleSetCallback), nullptr); addWidget((GtkWidget*)gtk_tool_button_new(nullptr, "Qt")); addWidget(gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE)); addWidget(gtk_hbutton_box_new()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle_p.h new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle_p.h --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle_p.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle_p.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle_p_p.h new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle_p_p.h --- old/qt6gtk2-0.3/src/qt6gtk2-style/qgtkstyle_p_p.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qgtkstyle_p_p.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qstylehelper.cpp new/qt6gtk2-0.4/src/qt6gtk2-style/qstylehelper.cpp --- old/qt6gtk2-0.3/src/qt6gtk2-style/qstylehelper.cpp 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qstylehelper.cpp 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -219,7 +219,12 @@ } // Cache dial background + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + QCachedPainter p(painter, QLatin1StringView("qdial"), option); +#else BEGIN_STYLE_PIXMAPCACHE(QString::fromLatin1("qdial")); +#endif p->setRenderHint(QPainter::Antialiasing); const qreal d_ = r / 6; @@ -279,7 +284,11 @@ p->drawEllipse(br.adjusted(-1, -1, 1, 1)); } +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + p.finish(); +#else END_STYLE_PIXMAPCACHE +#endif QPointF dp = calcRadialPos(option, qreal(0.70)); buttonColor = buttonColor.lighter(104); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt6gtk2-0.3/src/qt6gtk2-style/qstylehelper_p.h new/qt6gtk2-0.4/src/qt6gtk2-style/qstylehelper_p.h --- old/qt6gtk2-0.3/src/qt6gtk2-style/qstylehelper_p.h 2024-08-14 15:12:35.000000000 +0200 +++ new/qt6gtk2-0.4/src/qt6gtk2-style/qstylehelper_p.h 2025-03-04 17:25:32.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkoto...@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkoto...@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by *
