Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2021-09-16 23:13:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Thu Sep 16 23:13:55 2021 rev:96 rq:919184 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2021-08-16 10:11:38.975094030 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new.1899/kdeclarative.changes 2021-09-16 23:15:39.363859461 +0200 @@ -1,0 +2,21 @@ +Wed Sep 15 08:24:02 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:22:00 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- Changes since 5.85.0: + * document clipboard more extensively + * Add missing PRIVATE part for linking in cmake + * Try to fix Android build via linking GLESv3 + * qtquicksettings: Add workaround for Nvidia Wayland + * GridDelegate: Fix non-existant context property + * AbstractKCM: Fix padding when header/footer is not visible + * Don't use the KIO AccessManager on Android + +------------------------------------------------------------------- Old: ---- baselibs.conf kdeclarative-5.85.0.tar.xz kdeclarative-5.85.0.tar.xz.sig New: ---- kdeclarative-5.86.0.tar.xz kdeclarative-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.IdnzJQ/_old 2021-09-16 23:15:40.015860137 +0200 +++ /var/tmp/diff_new_pack.IdnzJQ/_new 2021-09-16 23:15:40.019860140 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Declarative5 -%define _tar_path 5.85 +%define _tar_path 5.86 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kdeclarative -Version: 5.85.0 +Version: 5.86.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later @@ -35,7 +35,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ kdeclarative-5.85.0.tar.xz -> kdeclarative-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/.git-blame-ignore-revs new/kdeclarative-5.86.0/.git-blame-ignore-revs --- old/kdeclarative-5.85.0/.git-blame-ignore-revs 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/.git-blame-ignore-revs 2021-09-04 18:58:24.000000000 +0200 @@ -1,3 +1,4 @@ -#clang-format +#clang-format/tidy 7481371ef05cd137ef6daabad478e2ae410541d8 1c38b1a4234efee41486e8babdac100fc6605d67 +c2fa7d9fe178344c2e07921a5bafaf1dae80edf5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/CMakeLists.txt new/kdeclarative-5.86.0/CMakeLists.txt --- old/kdeclarative-5.85.0/CMakeLists.txt 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/CMakeLists.txt 2021-09-04 18:58:24.000000000 +0200 @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts -set(KF_DEP_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts +set(KF_DEP_VERSION "5.86.0") # handled by release scripts project(KDeclarative VERSION ${KF_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Qml Quick Gui) include(KDEInstallDirs) @@ -33,7 +33,7 @@ ######################################################################### -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) #add_definitions(-Wno-deprecated) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/autotests/util.cpp new/kdeclarative-5.86.0/autotests/util.cpp --- old/kdeclarative-5.85.0/autotests/util.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/autotests/util.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -38,8 +38,9 @@ QString QQmlDataTest::testFile(const QString &fileName) const { - if (m_directory.isEmpty()) + if (m_directory.isEmpty()) { qFatal("QQmlDataTest::initTestCase() not called."); + } QString result = m_dataDirectory; result += QLatin1Char('/'); result += fileName; @@ -53,13 +54,16 @@ QTextStream str(&result); str << "Component '" << c.url().toString() << "' has " << errors.size() << " errors: '"; for (int i = 0; i < errors.size(); ++i) { - if (i) + if (i) { str << ", '"; + } str << errors.at(i).toString() << '\''; } - if (!engine) - if (QQmlContext *context = c.creationContext()) + if (!engine) { + if (QQmlContext *context = c.creationContext()) { engine = context->engine(); + } + } if (engine) { str << " Import paths: (" << engine->importPathList().join(QLatin1String(", ")) << ") Plugin paths: (" << engine->pluginPathList().join(QLatin1String(", ")) << ')'; @@ -74,8 +78,9 @@ void QQmlTestMessageHandler::messageHandler(QtMsgType, const QMessageLogContext &, const QString &message) { QMutexLocker locker(qQmlTestMessageHandlerMutex()); - if (QQmlTestMessageHandler::m_instance) + if (QQmlTestMessageHandler::m_instance) { QQmlTestMessageHandler::m_instance->m_messages.push_back(message); + } } QQmlTestMessageHandler::QQmlTestMessageHandler() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/metainfo.yaml new/kdeclarative-5.86.0/metainfo.yaml --- old/kdeclarative-5.85.0/metainfo.yaml 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/metainfo.yaml 2021-09-04 18:58:24.000000000 +0200 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS note: The supported remote Urls depends from what runtime kio slaves plugins are installed portingAid: false deprecated: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/po/vi/kdeclarative5.po new/kdeclarative-5.86.0/po/vi/kdeclarative5.po --- old/kdeclarative-5.85.0/po/vi/kdeclarative5.po 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/po/vi/kdeclarative5.po 2021-09-04 18:58:24.000000000 +0200 @@ -29,7 +29,7 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "" -"[email protected],[email protected],[email protected]," +"[email protected],[email protected],[email protected]," "[email protected]" #: kpackagelauncherqml/main.cpp:30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.86.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.85.0/po/zh_CN/kdeclarative5.po 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/po/zh_CN/kdeclarative5.po 2021-09-04 18:58:24.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-06-03 00:14+0000\n" -"PO-Revision-Date: 2021-07-26 13:47\n" +"PO-Revision-Date: 2021-08-30 11:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/kdeclarative/CMakeLists.txt new/kdeclarative-5.86.0/src/kdeclarative/CMakeLists.txt --- old/kdeclarative-5.85.0/src/kdeclarative/CMakeLists.txt 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/kdeclarative/CMakeLists.txt 2021-09-04 18:58:24.000000000 +0200 @@ -5,8 +5,10 @@ qmlobjectsharedengine.cpp kdeclarative.cpp private/kiconprovider.cpp - private/kioaccessmanagerfactory.cpp ) +if(NOT ANDROID) + list(APPEND kdeclarative_SRCS private/kioaccessmanagerfactory.cpp) +endif() add_library(KF5Declarative ${kdeclarative_SRCS}) add_library(KF5::Declarative ALIAS KF5Declarative) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/kdeclarative/kdeclarative.cpp new/kdeclarative-5.86.0/src/kdeclarative/kdeclarative.cpp --- old/kdeclarative-5.85.0/src/kdeclarative/kdeclarative.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/kdeclarative/kdeclarative.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -87,11 +87,13 @@ void KDeclarative::setupEngine(QQmlEngine *engine) { +#ifndef Q_OS_ANDROID // get rid of stock network access manager factory QQmlNetworkAccessManagerFactory *factory = engine->networkAccessManagerFactory(); engine->setNetworkAccessManagerFactory(nullptr); delete factory; engine->setNetworkAccessManagerFactory(new KIOAccessManagerFactory()); +#endif /* Tell the engine to search for platform-specific imports first (so it will "win" in import name resolution). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp new/kdeclarative-5.86.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -342,7 +342,7 @@ pm.fill(Qt::transparent); QPainter p(&pm); int i = 0; - for (const QString &ic : qAsConst(icons)) { + for (const QString &ic : std::as_const(icons)) { p.drawPixmap(QPoint(i * imageSize, 0), QIcon::fromTheme(ic).pixmap(imageSize)); i++; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp new/kdeclarative-5.86.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -64,8 +64,9 @@ } void DeclarativeMimeData::setUrl(const QUrl &url) { - if (this->url() == url) + if (this->url() == url) { return; + } QList<QUrl> urlList; urlList.append(url); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/draganddrop/MimeDataWrapper.cpp new/kdeclarative-5.86.0/src/qmlcontrols/draganddrop/MimeDataWrapper.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/draganddrop/MimeDataWrapper.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/draganddrop/MimeDataWrapper.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -49,10 +49,11 @@ QVariant MimeDataWrapper::color() const { - if (m_data->hasColor()) + if (m_data->hasColor()) { return m_data->colorData(); - else + } else { return QVariant(); + } } QStringList MimeDataWrapper::formats() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml new/kdeclarative-5.86.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml --- old/kdeclarative-5.85.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2021-09-04 18:58:24.000000000 +0200 @@ -41,13 +41,14 @@ Kirigami.ColumnView.fillWidth: true leftPadding: 6 // Layout_ChildMarginWidth from Breeze - topPadding: headerParent.contentItem ? 0 : leftPadding + topPadding: headerParent.contentVisible ? 0 : leftPadding rightPadding: leftPadding - bottomPadding: footerParent.contentItem ? 0 : leftPadding + bottomPadding: footerParent.contentVisible ? 0 : leftPadding header: QtControls.Control { id: headerParent - height: contentItem ? implicitHeight : 0 + readonly property bool contentVisible: contentItem && contentItem.visible && contentItem.implicitHeight + height: contentVisible ? implicitHeight : 0 leftPadding: 6 // Layout_ChildMarginWidth from Breeze topPadding: leftPadding rightPadding: leftPadding @@ -56,7 +57,8 @@ footer: QtControls.Control { id: footerParent - height: contentItem ? implicitHeight : 0 + readonly property bool contentVisible: contentItem && contentItem.visible && contentItem.implicitHeight + height: contentVisible ? implicitHeight : 0 leftPadding: 6 // Layout_ChildMarginWidth from Breeze topPadding: leftPadding rightPadding: leftPadding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml new/kdeclarative-5.86.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml --- old/kdeclarative-5.85.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 2021-09-04 18:58:24.000000000 +0200 @@ -200,7 +200,7 @@ visible: delegate.subtitle.length > 0 opacity: 0.6 text: delegate.subtitle - font.pointSize: theme.smallestFont.pointSize + font.pointSize: Kirigami.Theme.smallFont.pointSize font.bold: delegate.GridView.isCurrentItem elide: Text.ElideRight } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp new/kdeclarative-5.86.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -34,7 +34,7 @@ const auto className = itemClassName(item); auto descendant = findDescendantItems(item); - for (auto child : qAsConst(descendant)) { + for (auto child : std::as_const(descendant)) { if (className.contains("FontWidget") && itemClassName(child).contains("TextField")) { return child->property("background").value<QQuickItem *>(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -26,7 +26,7 @@ class KeySequenceHelperPrivate { public: - KeySequenceHelperPrivate(KeySequenceHelper *q); + KeySequenceHelperPrivate(KeySequenceHelper *qq); /** * Conflicts the key sequence @a seq with a current standard @@ -62,8 +62,8 @@ KeySequenceHelper::ShortcutTypes checkAgainstShortcutTypes; }; -KeySequenceHelperPrivate::KeySequenceHelperPrivate(KeySequenceHelper *q) - : q(q) +KeySequenceHelperPrivate::KeySequenceHelperPrivate(KeySequenceHelper *qq) + : q(qq) , checkAgainstShortcutTypes(KeySequenceHelper::StandardShortcuts | KeySequenceHelper::GlobalShortcuts) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -48,15 +48,17 @@ if (format == QLatin1String("text/uri-list")) { QVariantList retList; const auto urls = data->urls(); - for (const QUrl &url : urls) + for (const QUrl &url : urls) { retList += url; + } ret = retList; } else if (format.startsWith(QLatin1String("text/"))) { ret = data->text(); } else if (format.startsWith(QLatin1String("image/"))) { ret = data->imageData(); - } else + } else { ret = data->data(format.isEmpty() ? data->formats().first() : format); + } return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h --- old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h 2021-09-04 18:58:24.000000000 +0200 @@ -12,6 +12,27 @@ class ClipboardPrivate; +/** + * @brief Wrapper for QClipboard + * + * Offers a simple wrapper to interact with QClipboard from QtQuick. + * + * ``` + * import QtQuick 2.5 + * import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons + * Text { + * text: "lorem ipsum" + * + * KQuickControlsAddons.Clipboard { id: clipboard } + * + * MouseArea { + * anchors.fill: parent + * acceptedButtons: Qt.LeftButton | Qt.RightButton + * onClicked: clipboard.content = parent.text + * } + * } + * ``` + */ class Clipboard : public QObject { Q_OBJECT @@ -26,7 +47,7 @@ Q_PROPERTY(QVariant content READ content WRITE setContent NOTIFY contentChanged) /** - * Figure out the nature of the contents in the clipboard. + * Figure out the nature of the contents in the clipboard as mimetype strings. */ Q_PROPERTY(QStringList formats READ formats NOTIFY contentChanged) @@ -36,12 +57,17 @@ QClipboard::Mode mode() const; void setMode(QClipboard::Mode mode); + /** + * @param format mimetype string + * @return Output based on the mimetype. This may be a list of URLs, text, image data, or use QMimeData::data + */ Q_SCRIPTABLE QVariant contentFormat(const QString &format) const; QVariant content() const; void setContent(const QVariant &content); QStringList formats() const; + /** @see QClipboard::clear() */ Q_SCRIPTABLE void clear(); Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -130,8 +130,9 @@ QModelIndex ColumnProxyModel::proxyIndex(const QModelIndex &sourceIndex) const { - if (sourceIndex.parent() == m_index) + if (sourceIndex.parent() == m_index) { return index(sourceIndex.row(), sourceIndex.column(), QModelIndex()); + } return QModelIndex(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp --- old/kdeclarative-5.85.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -115,7 +115,7 @@ m_max = std::numeric_limits<qreal>::min(); m_min = std::numeric_limits<qreal>::max(); - for (auto v : qAsConst(m_values)) { + for (auto v : std::as_const(m_values)) { if (v > m_max) { m_max = v; } else if (v < m_min) { @@ -356,7 +356,7 @@ m_sampleSize = size; m_mutex.lock(); - for (auto data : qAsConst(m_plotData)) { + for (auto data : std::as_const(m_plotData)) { data->setSampleSize(size); } m_mutex.unlock(); @@ -494,7 +494,7 @@ int i = 0; m_mutex.lock(); - for (auto data : qAsConst(m_plotData)) { + for (auto data : std::as_const(m_plotData)) { data->addSample(value.value(i)); ++i; } @@ -632,7 +632,7 @@ int roundedHeight = qRound(height()); int roundedWidth = qRound(width()); - for (auto data : qAsConst(m_plotData)) { + for (auto data : std::as_const(m_plotData)) { // Interpolate the data set const QPainterPath path = interpolate(data->m_normalizedValues, 0, roundedWidth); @@ -705,7 +705,7 @@ QPair<int, int> oldCount; m_mutex.lock(); - for (auto data : qAsConst(m_plotData)) { + for (auto data : std::as_const(m_plotData)) { color2 = data->color(); color2.setAlphaF(0.60); // Draw the graph @@ -893,7 +893,7 @@ } while (i != m_plotData.constBegin()); } else { - for (auto data : qAsConst(m_plotData)) { + for (auto data : std::as_const(m_plotData)) { data->m_normalizedValues.clear(); data->m_normalizedValues = data->values().toVector(); // global max and global min @@ -907,11 +907,13 @@ } m_mutex.unlock(); - if (adjustedMin > 0.0 && adjustedMax > 0.0) + if (adjustedMin > 0.0 && adjustedMax > 0.0) { adjustedMin = 0.0; + } - if (adjustedMin < 0.0 && adjustedMax < 0.0) + if (adjustedMin < 0.0 && adjustedMax < 0.0) { adjustedMax = 0.0; + } if (m_autoRange || m_rangeMax > m_rangeMin) { if (!m_autoRange) { @@ -929,7 +931,7 @@ // normalizebased on global max and min m_mutex.lock(); - for (auto data : qAsConst(m_plotData)) { + for (auto data : std::as_const(m_plotData)) { for (int i = 0; i < data->values().count(); ++i) { data->m_normalizedValues[i] = (data->m_normalizedValues.value(i) - adjustedMin) * adjust; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/quickaddons/CMakeLists.txt new/kdeclarative-5.86.0/src/quickaddons/CMakeLists.txt --- old/kdeclarative-5.85.0/src/quickaddons/CMakeLists.txt 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/quickaddons/CMakeLists.txt 2021-09-04 18:58:24.000000000 +0200 @@ -24,6 +24,9 @@ KF5::Declarative KF5::ConfigGui ) +if (ANDROID) + target_link_libraries(KF5QuickAddons PRIVATE GLESv3) +endif() set_target_properties(KF5QuickAddons PROPERTIES VERSION ${KDECLARATIVE_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/quickaddons/imagetexturescache.cpp new/kdeclarative-5.86.0/src/quickaddons/imagetexturescache.cpp --- old/kdeclarative-5.85.0/src/quickaddons/imagetexturescache.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/quickaddons/imagetexturescache.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -33,8 +33,9 @@ auto cleanAndDelete = [this, window, id](QSGTexture *texture) { QHash<QWindow *, QWeakPointer<QSGTexture>> &textures = (d->cache)[id]; textures.remove(window); - if (textures.isEmpty()) + if (textures.isEmpty()) { d->cache.remove(id); + } delete texture; }; texture = QSharedPointer<QSGTexture>(window->createTextureFromImage(image, options), cleanAndDelete); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/quickaddons/managedconfigmodule.cpp new/kdeclarative-5.86.0/src/quickaddons/managedconfigmodule.cpp --- old/kdeclarative-5.85.0/src/quickaddons/managedconfigmodule.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/quickaddons/managedconfigmodule.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -53,7 +53,7 @@ void ManagedConfigModule::load() { - for (const auto &skeleton : qAsConst(d->_skeletons)) { + for (const auto &skeleton : std::as_const(d->_skeletons)) { if (skeleton) { skeleton->load(); } @@ -62,7 +62,7 @@ void ManagedConfigModule::save() { - for (const auto &skeleton : qAsConst(d->_skeletons)) { + for (const auto &skeleton : std::as_const(d->_skeletons)) { if (skeleton) { skeleton->save(); } @@ -71,7 +71,7 @@ void ManagedConfigModule::defaults() { - for (const auto &skeleton : qAsConst(d->_skeletons)) { + for (const auto &skeleton : std::as_const(d->_skeletons)) { if (skeleton) { skeleton->setDefaults(); } @@ -100,7 +100,7 @@ { bool needsSave = false; bool representsDefaults = true; - for (const auto &skeleton : qAsConst(d->_skeletons)) { + for (const auto &skeleton : std::as_const(d->_skeletons)) { if (skeleton) { needsSave |= skeleton->isSaveNeeded(); representsDefaults &= skeleton->isDefaults(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.85.0/src/quickaddons/qtquicksettings.cpp new/kdeclarative-5.86.0/src/quickaddons/qtquicksettings.cpp --- old/kdeclarative-5.85.0/src/quickaddons/qtquicksettings.cpp 2021-08-06 11:02:19.000000000 +0200 +++ new/kdeclarative-5.86.0/src/quickaddons/qtquicksettings.cpp 2021-09-04 18:58:24.000000000 +0200 @@ -1,6 +1,7 @@ /* SPDX-FileCopyrightText: 2016 David Edmundson <[email protected]> SPDX-FileCopyrightText: 2020 Piotr Henryk Dabrowski <[email protected]> + SPDX-FileCopyrightText: 2021 David Redondo <[email protected]> SPDX-License-Identifier: LGPL-2.0-or-later */ @@ -10,7 +11,9 @@ #include <QGuiApplication> #include <QLibraryInfo> +#include <QOffscreenSurface> #include <QOpenGLContext> +#include <QOpenGLFunctions> #include <QQuickWindow> #include <QSurfaceFormat> #include <QVersionNumber> @@ -22,7 +25,7 @@ * * @returns true if the selected backend is supported, false on fallback to software mode. */ -static bool checkBackend() +static bool checkBackend(QOpenGLContext &checkContext) { if (!QQuickWindow::sceneGraphBackend().isEmpty()) { return true; // QtQuick is not configured to use the OpenGL backend @@ -38,9 +41,7 @@ #ifdef QT_NO_OPENGL bool ok = false; #else - QOpenGLContext *gl = new QOpenGLContext(); - bool ok = gl->create(); - delete gl; + bool ok = checkContext.create(); #endif if (!ok) { qWarning("Warning: fallback to QtQuick software backend."); @@ -57,15 +58,29 @@ } PlasmaQtQuickSettings::RendererSettings s; - if (!s.renderLoop().isEmpty() && !qEnvironmentVariableIsSet("QSG_RENDER_LOOP")) { - qputenv("QSG_RENDER_LOOP", s.renderLoop().toLatin1()); - } - + QOpenGLContext checkContext; if (!s.sceneGraphBackend().isEmpty()) { QQuickWindow::setSceneGraphBackend(s.sceneGraphBackend()); } else { QQuickWindow::setSceneGraphBackend(QStringLiteral("")); - checkBackend(); + checkBackend(checkContext); + } + + if (!qEnvironmentVariableIsSet("QSG_RENDER_LOOP")) { + if (!s.renderLoop().isEmpty()) { + qputenv("QSG_RENDER_LOOP", s.renderLoop().toLatin1()); + } else if (QGuiApplication::platformName() == QLatin1String("wayland")) { + // Workaround for Bug 432062 / QTBUG-95817 + QOffscreenSurface surface; + surface.create(); + if (checkContext.makeCurrent(&surface)) { + const char *vendor = reinterpret_cast<const char *>(checkContext.functions()->glGetString(GL_VENDOR)); + if (qstrcmp(vendor, "NVIDIA Corporation") == 0) { + // Otherwise Qt Quick Windows break when resized + qputenv("QSG_RENDER_LOOP", "basic"); + } + } + } } auto format = QSurfaceFormat::defaultFormat();
