Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lxqt-qtplugin for openSUSE:Factory checked in at 2021-04-17 00:01:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-qtplugin (Old) and /work/SRC/openSUSE:Factory/.lxqt-qtplugin.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-qtplugin" Sat Apr 17 00:01:49 2021 rev:15 rq:885934 version:0.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-qtplugin/lxqt-qtplugin.changes 2020-11-04 18:32:34.240123981 +0100 +++ /work/SRC/openSUSE:Factory/.lxqt-qtplugin.new.12324/lxqt-qtplugin.changes 2021-04-17 00:02:01.737619030 +0200 @@ -1,0 +2,9 @@ +Fri Apr 16 06:54:33 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 0.17.0: + * Handled Qt 5.15 deprecations. + * Don't check before deleting a pointer. + * Don't use implicit conversions. + * Fixed a palette/highlight color related typo. + +------------------------------------------------------------------- Old: ---- lxqt-qtplugin-0.16.0.tar.xz lxqt-qtplugin-0.16.0.tar.xz.asc New: ---- lxqt-qtplugin-0.17.0.tar.xz lxqt-qtplugin-0.17.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-qtplugin.spec ++++++ --- /var/tmp/diff_new_pack.VxAauc/_old 2021-04-17 00:02:02.733620601 +0200 +++ /var/tmp/diff_new_pack.VxAauc/_new 2021-04-17 00:02:02.737620607 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxqt-qtplugin # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: lxqt-qtplugin -Version: 0.16.0 +Version: 0.17.0 Release: 0 Summary: LXQt platform integration plugin for Qt 5 License: LGPL-2.1-or-later @@ -30,13 +30,13 @@ BuildRequires: gcc-c++ BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libexif-devel -BuildRequires: lxqt-build-tools-devel >= 0.8.0 +BuildRequires: lxqt-build-tools-devel >= 0.9.0 BuildRequires: pkgconfig BuildRequires: cmake(KF5WindowSystem) BuildRequires: pkgconfig(Qt5Gui) >= 5.12.0 BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xdg) >= 3.6.0 +BuildRequires: pkgconfig(Qt5Xdg) >= 3.7.0 BuildRequires: pkgconfig(Qt5XdgIconLoader) BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(libfm-qt) >= %{version} ++++++ lxqt-qtplugin-0.16.0.tar.xz -> lxqt-qtplugin-0.17.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.16.0/CHANGELOG new/lxqt-qtplugin-0.17.0/CHANGELOG --- old/lxqt-qtplugin-0.16.0/CHANGELOG 2020-10-30 14:42:33.000000000 +0100 +++ new/lxqt-qtplugin-0.17.0/CHANGELOG 2021-04-05 16:18:48.000000000 +0200 @@ -1,3 +1,10 @@ +lxqt-qtplugin-0.17.0 / 2021-04-15 +================================= + * Handled Qt 5.15 deprecations. + * Don't check before deleting a pointer. + * Don't use implicit conversions. + * Fixed a palette/highlight color related typo. + lxqt-qtplugin-0.16.0 / 2020-11-01 ================================= * Do not reset widget palettes on changing style. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.16.0/CMakeLists.txt new/lxqt-qtplugin-0.17.0/CMakeLists.txt --- old/lxqt-qtplugin-0.16.0/CMakeLists.txt 2020-10-30 14:42:33.000000000 +0100 +++ new/lxqt-qtplugin-0.17.0/CMakeLists.txt 2021-04-05 16:18:48.000000000 +0200 @@ -13,10 +13,10 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Minimum Versions -set(LXQTBT_MINIMUM_VERSION "0.8.0") +set(LXQTBT_MINIMUM_VERSION "0.9.0") set(QT_MINIMUM_VERSION "5.12.0") -set(QTXDG_MINIMUM_VERSION "3.6.0") -set(FMQT_MINIMUM_VERSION "0.16.0") +set(QTXDG_MINIMUM_VERSION "3.7.0") +set(FMQT_MINIMUM_VERSION "0.17.0") find_package(Qt5DBus ${QT_MINIMUM_VERSION} REQUIRED) find_package(Qt5LinguistTools ${QT_MINIMUM_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.16.0/src/lxqtplatformtheme.cpp new/lxqt-qtplugin-0.17.0/src/lxqtplatformtheme.cpp --- old/lxqt-qtplugin-0.16.0/src/lxqtplatformtheme.cpp 2020-10-30 14:42:33.000000000 +0100 +++ new/lxqt-qtplugin-0.17.0/src/lxqtplatformtheme.cpp 2021-04-05 16:18:48.000000000 +0200 @@ -76,10 +76,8 @@ } LXQtPlatformTheme::~LXQtPlatformTheme() { - if(LXQtPalette_) - delete LXQtPalette_; - if(settingsWatcher_) - delete settingsWatcher_; + delete LXQtPalette_; + delete settingsWatcher_; } void LXQtPlatformTheme::lazyInit() @@ -149,7 +147,7 @@ color = highlightedTextColor_; highlightedTextColor_.setNamedColor(settings.value(QLatin1String("highlighted_text_color")).toString()); if (!paletteChanged_) - paletteChanged_ = color != highlightedTextColor_.isValid() && color != highlightedTextColor_; + paletteChanged_ = highlightedTextColor_.isValid() && color != highlightedTextColor_; color = linkColor_; linkColor_.setNamedColor(settings.value(QLatin1String("link_color")).toString()); @@ -163,8 +161,7 @@ if(paletteChanged_) { - if(LXQtPalette_) - delete LXQtPalette_; + delete LXQtPalette_; // This sets all colors appropriately but valid custom colors are set below. // If a custom color is not valid, Qt's calculated color will be used. LXQtPalette_ = new QPalette(winColor_); @@ -286,7 +283,7 @@ { QApplication::setStyle(style_); // Qt 5.15 needs this and it's safe otherwise - if(LXQtPalette_) + if(LXQtPalette_ != nullptr) { QApplication::setPalette(*LXQtPalette_); // the app should be polished because the style may have an internal palette @@ -332,7 +329,7 @@ bool LXQtPlatformTheme::usePlatformNativeDialog(DialogType type) const { if(type == FileDialog - && qobject_cast<QApplication *>(QCoreApplication::instance())) { // QML may not have qApp + && (qobject_cast<QApplication *>(QCoreApplication::instance()) != nullptr)) { // QML may not have qApp // use our own file dialog return true; } @@ -342,7 +339,7 @@ QPlatformDialogHelper *LXQtPlatformTheme::createPlatformDialogHelper(DialogType type) const { if(type == FileDialog - && qobject_cast<QApplication *>(QCoreApplication::instance())) { // QML may not have qApp + && (qobject_cast<QApplication *>(QCoreApplication::instance()) != nullptr)) { // QML may not have qApp // use our own file dialog provided by libfm // When a process has this environment set, that means glib event loop integration is disabled. @@ -362,7 +359,7 @@ // try to resolve the symbol to get the function pointer createFileDialogHelper = reinterpret_cast<CreateFileDialogHelperFunc>(libfmQtLibrary.resolve("createFileDialogHelper")); - if(!createFileDialogHelper) { + if(createFileDialogHelper == nullptr) { return nullptr; } } @@ -375,7 +372,7 @@ const QPalette *LXQtPlatformTheme::palette(Palette type) const { if(type == QPlatformTheme::SystemPalette) { - if(LXQtPalette_) + if(LXQtPalette_ != nullptr) return LXQtPalette_; } return nullptr; @@ -498,7 +495,11 @@ xdgDirs.append(xdgDataDirs); for (const auto &s: xdgDirs) { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + const QStringList r = s.split(QLatin1Char(':'), Qt::SkipEmptyParts); +#else const QStringList r = s.split(QLatin1Char(':'), QString::SkipEmptyParts); +#endif for (const auto& xdgDir: r) { const QFileInfo xdgIconsDir(xdgDir + QStringLiteral("/icons")); if (xdgIconsDir.isDir()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.16.0/src/lxqtsystemtrayicon.cpp new/lxqt-qtplugin-0.17.0/src/lxqtsystemtrayicon.cpp --- old/lxqt-qtplugin-0.16.0/src/lxqtsystemtrayicon.cpp 2020-10-30 14:42:33.000000000 +0100 +++ new/lxqt-qtplugin-0.17.0/src/lxqtsystemtrayicon.cpp 2021-04-05 16:18:48.000000000 +0200 @@ -45,7 +45,7 @@ SystemTrayMenu::~SystemTrayMenu() { - if (m_menu) + if (m_menu != nullptr) m_menu->deleteLater(); } @@ -67,7 +67,7 @@ if (*it == oursBefore) { m_items.insert(it, ours); - if (m_menu) + if (m_menu != nullptr) m_menu->insertAction(oursBefore->action(), ours->action()); inserted = true; @@ -79,7 +79,7 @@ if (!inserted) { m_items.append(ours); - if (m_menu) + if (m_menu != nullptr) m_menu->addAction(ours->action()); } } @@ -111,14 +111,14 @@ if (SystemTrayMenuItem *ours = qobject_cast<SystemTrayMenuItem*>(menuItem)) { m_items.removeOne(ours); - if (ours->action() && m_menu) + if ((ours->action() != nullptr) && (m_menu != nullptr)) m_menu->removeAction(ours->action()); } } void SystemTrayMenu::setEnabled(bool enabled) { - if (!m_menu) + if (m_menu == nullptr) return; m_menu->setEnabled(enabled); @@ -126,7 +126,7 @@ void SystemTrayMenu::setIcon(const QIcon &icon) { - if (!m_menu) + if (m_menu == nullptr) return; m_menu->setIcon(icon); @@ -139,7 +139,7 @@ void SystemTrayMenu::setText(const QString &text) { - if (!m_menu) + if (m_menu == nullptr) return; m_menu->setTitle(text); @@ -147,7 +147,7 @@ void SystemTrayMenu::setVisible(bool visible) { - if (!m_menu) + if (m_menu == nullptr) return; m_menu->setVisible(visible); @@ -160,7 +160,7 @@ void SystemTrayMenu::syncSeparatorsCollapsible(bool enable) { - if (!m_menu) + if (m_menu == nullptr) return; m_menu->setSeparatorsCollapsible(enable); @@ -279,7 +279,7 @@ void LXQtSystemTrayIcon::init() { - if (!mSni) + if (mSni == nullptr) { mSni = new StatusNotifierItem(QString::number(QCoreApplication::applicationPid()), this); mSni->setTitle(QApplication::applicationDisplayName()); @@ -315,7 +315,7 @@ void LXQtSystemTrayIcon::updateIcon(const QIcon &icon) { - if (!mSni) + if (mSni == nullptr) return; if (icon.name().isEmpty()) @@ -332,7 +332,7 @@ void LXQtSystemTrayIcon::updateToolTip(const QString &tooltip) { - if (!mSni) + if (mSni == nullptr) return; mSni->setToolTipTitle(tooltip); @@ -340,7 +340,7 @@ void LXQtSystemTrayIcon::updateMenu(QPlatformMenu *menu) { - if (!mSni) + if (mSni == nullptr) return; if (SystemTrayMenu *ourMenu = qobject_cast<SystemTrayMenu*>(menu)) @@ -361,7 +361,7 @@ void LXQtSystemTrayIcon::showMessage(const QString &title, const QString &msg, const QIcon &icon, MessageIcon, int secs) { - if (!mSni) + if (mSni == nullptr) return; mSni->showMessage(title, msg, icon.name(), secs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.16.0/src/main.cpp new/lxqt-qtplugin-0.17.0/src/main.cpp --- old/lxqt-qtplugin-0.16.0/src/main.cpp 2020-10-30 14:42:33.000000000 +0100 +++ new/lxqt-qtplugin-0.17.0/src/main.cpp 2021-04-05 16:18:48.000000000 +0200 @@ -40,7 +40,7 @@ }; QPlatformTheme *LXQtPlatformThemePlugin::create(const QString &key, const QStringList &/*params*/) { - if (!key.compare(QLatin1String("lxqt"), Qt::CaseInsensitive)) + if (key.compare(QLatin1String("lxqt"), Qt::CaseInsensitive) == 0) return new LXQtPlatformTheme(); return nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.16.0/src/statusnotifieritem/statusnotifieritem.cpp new/lxqt-qtplugin-0.17.0/src/statusnotifieritem/statusnotifieritem.cpp --- old/lxqt-qtplugin-0.16.0/src/statusnotifieritem/statusnotifieritem.cpp 2020-10-30 14:42:33.000000000 +0100 +++ new/lxqt-qtplugin-0.17.0/src/statusnotifieritem/statusnotifieritem.cpp 2021-04-05 16:18:48.000000000 +0200 @@ -272,7 +272,7 @@ void StatusNotifierItem::ContextMenu(int x, int y) { - if (mMenu) + if (mMenu != nullptr) { if (mMenu->isVisible()) mMenu->popup(QPoint(x, y));
