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-02-17 18:10:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Wed Feb 17 18:10:36 2021 rev:89 rq:871684 version:5.79.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2021-01-13 18:17:24.029020393 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new.28504/kdeclarative.changes 2021-02-17 18:11:47.661953089 +0100 @@ -1,0 +2,16 @@ +Mon Feb 8 08:46:11 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.79.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.79.0 +- Changes since 5.78.0: + * 1 column lower limit on mobile 2 elsewhere + * allow single column items + * KeySequenceItem: Assign empty string on clear instead of undefined (kde#432106) + * typo-- + * Disambiguate selected vs hovered states for GridDelegate (kde#406914) + * Use Single mode by default + * GridDelegate: remove hover animations + +------------------------------------------------------------------- Old: ---- kdeclarative-5.78.0.tar.xz kdeclarative-5.78.0.tar.xz.sig New: ---- kdeclarative-5.79.0.tar.xz kdeclarative-5.79.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.lDKIEK/_old 2021-02-17 18:11:48.253953574 +0100 +++ /var/tmp/diff_new_pack.lDKIEK/_new 2021-02-17 18:11:48.257953577 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Declarative5 -%define _tar_path 5.78 +%define _tar_path 5.79 # 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.78.0 +Version: 5.79.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later ++++++ kdeclarative-5.78.0.tar.xz -> kdeclarative-5.79.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/.gitignore new/kdeclarative-5.79.0/.gitignore --- old/kdeclarative-5.78.0/.gitignore 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/.gitignore 2021-02-06 19:13:39.000000000 +0100 @@ -20,3 +20,4 @@ CMakeLists.txt.user* *.unc-backup* .cmake/ +/.clang-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/CMakeLists.txt new/kdeclarative-5.79.0/CMakeLists.txt --- old/kdeclarative-5.78.0/CMakeLists.txt 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/CMakeLists.txt 2021-02-06 19:13:39.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.78.0") # handled by release scripts -set(KF5_DEP_VERSION "5.78.0") # handled by release scripts -project(KDeclarative VERSION ${KF5_VERSION}) +set(KF_VERSION "5.79.0") # handled by release scripts +set(KF_DEP_VERSION "5.79.0") # handled by release scripts +project(KDeclarative VERSION ${KF_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.78.0 NO_MODULE) +find_package(ECM 5.79.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) @@ -19,16 +19,16 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Package ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Notifications ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) +find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED) +find_package(KF5IconThemes ${KF_DEP_VERSION} REQUIRED) +find_package(KF5KIO ${KF_DEP_VERSION} REQUIRED) +find_package(KF5WidgetsAddons ${KF_DEP_VERSION} REQUIRED) +find_package(KF5WindowSystem ${KF_DEP_VERSION} REQUIRED) +find_package(KF5GlobalAccel ${KF_DEP_VERSION} REQUIRED) +find_package(KF5GuiAddons ${KF_DEP_VERSION} REQUIRED) +find_package(KF5Package ${KF_DEP_VERSION} REQUIRED) +find_package(KF5Notifications ${KF_DEP_VERSION} REQUIRED) ######################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/KF5DeclarativeConfig.cmake.in new/kdeclarative-5.79.0/KF5DeclarativeConfig.cmake.in --- old/kdeclarative-5.78.0/KF5DeclarativeConfig.cmake.in 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/KF5DeclarativeConfig.cmake.in 2021-02-06 19:13:39.000000000 +0100 @@ -2,9 +2,9 @@ include(CMakeFindDependencyMacro) find_dependency(Qt5Quick "@REQUIRED_QT_VERSION@") -find_dependency(KF5Config "@KF5_DEP_VERSION@") -find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") -find_dependency(KF5Package "@KF5_DEP_VERSION@") +find_dependency(KF5Config "@KF_DEP_VERSION@") +find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") +find_dependency(KF5Package "@KF_DEP_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5DeclarativeTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/po/pl/kdeclarative5.po new/kdeclarative-5.79.0/po/pl/kdeclarative5.po --- old/kdeclarative-5.78.0/po/pl/kdeclarative5.po 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/po/pl/kdeclarative5.po 2021-02-06 19:13:39.000000000 +0100 @@ -11,13 +11,13 @@ # Marta Rybczy??ska <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # Michal Rudolf <[email protected]>, 2010. # Artur Ch??ond <[email protected]>, 2010. -# ??ukasz Wojni??owicz <[email protected]>, 2011, 2012, 2013, 2014, 2015, 2016, 2019. +# ??ukasz Wojni??owicz <[email protected]>, 2011, 2012, 2013, 2014, 2015, 2016, 2019, 2021. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-11-13 02:11+0100\n" -"PO-Revision-Date: 2019-10-20 11:42+0200\n" +"PO-Revision-Date: 2021-01-09 09:18+0100\n" "Last-Translator: ??ukasz Wojni??owicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -108,7 +108,7 @@ ">\n" ">\n" ">\n" -"X-Generator: Lokalize 19.07.70\n" +"X-Generator: Lokalize 20.12.1\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -192,10 +192,9 @@ msgstr "Przypisz ponownie" #: quickaddons/configmodule.cpp:164 -#, fuzzy, kde-format -#| msgid "Invalid KPackage" +#, kde-format msgid "Invalid KPackage '%1'" -msgstr "Nieprawid??owy KPackage" +msgstr "Nieprawid??owy KPackage '%1'" #: quickaddons/configmodule.cpp:170 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.79.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.78.0/po/zh_CN/kdeclarative5.po 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/po/zh_CN/kdeclarative5.po 2021-02-06 19:13:39.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-11-13 02:11+0100\n" -"PO-Revision-Date: 2021-01-01 14:21\n" +"PO-Revision-Date: 2021-02-04 11:58\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.78.0/src/CMakeLists.txt new/kdeclarative-5.79.0/src/CMakeLists.txt --- old/kdeclarative-5.78.0/src/CMakeLists.txt 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/CMakeLists.txt 2021-02-06 19:13:39.000000000 +0100 @@ -12,7 +12,7 @@ KF5Declarative_QCH NAME KDeclarative BASE_NAME KF5Declarative - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API ${KQuickAddons_QCH_SOURCES} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/kdeclarative/CMakeLists.txt new/kdeclarative-5.79.0/src/kdeclarative/CMakeLists.txt --- old/kdeclarative-5.78.0/src/kdeclarative/CMakeLists.txt 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/kdeclarative/CMakeLists.txt 2021-02-06 19:13:39.000000000 +0100 @@ -14,7 +14,7 @@ EXPORT_FILE_NAME ${KDeclarative_BINARY_DIR}/kdeclarative/kdeclarative_export.h BASE_NAME KDeclarative GROUP_BASE_NAME KF - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 5.0 5.45 5.75 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/kdeclarative/configpropertymap.cpp new/kdeclarative-5.79.0/src/kdeclarative/configpropertymap.cpp --- old/kdeclarative-5.78.0/src/kdeclarative/configpropertymap.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/kdeclarative/configpropertymap.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -114,7 +114,7 @@ q->insert(item->key() + QStringLiteral("Default"), item->getDefault()); q->insert(item->key(), item->property()); if (option == EmitValueChanged) { - emit q->valueChanged(item->key(), item->property()); + Q_EMIT q->valueChanged(item->key(), item->property()); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/kdeclarative/kdeclarative.cpp new/kdeclarative-5.79.0/src/kdeclarative/kdeclarative.cpp --- old/kdeclarative-5.78.0/src/kdeclarative/kdeclarative.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/kdeclarative/kdeclarative.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -158,11 +158,7 @@ { if (KDeclarativePrivate::s_runtimePlatform.isEmpty()) { const QString env = QString::fromLocal8Bit(getenv("PLASMA_PLATFORM")); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - KDeclarativePrivate::s_runtimePlatform = QStringList(env.split(QLatin1Char(':'), QString::SkipEmptyParts)); -#else KDeclarativePrivate::s_runtimePlatform = QStringList(env.split(QLatin1Char(':'), Qt::SkipEmptyParts)); -#endif if (KDeclarativePrivate::s_runtimePlatform.isEmpty()) { KConfigGroup cg(KSharedConfig::openConfig(), "General"); KDeclarativePrivate::s_runtimePlatform = cg.readEntry(QStringLiteral("runtimePlatform"), KDeclarativePrivate::s_runtimePlatform); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/kdeclarative/qmlobject.cpp new/kdeclarative-5.79.0/src/kdeclarative/qmlobject.cpp --- old/kdeclarative-5.78.0/src/kdeclarative/qmlobject.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/kdeclarative/qmlobject.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -285,7 +285,7 @@ errorPrint(component); } - emit q->finished(); + Q_EMIT q->finished(); } void QmlObject::completeInitialization(const QVariantHash &initialProperties) @@ -317,7 +317,7 @@ if (!d->incubator.object()) { d->errorPrint(d->component); } - emit finished(); + Q_EMIT finished(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/kpackagelauncherqml/CMakeLists.txt new/kdeclarative-5.79.0/src/kpackagelauncherqml/CMakeLists.txt --- old/kdeclarative-5.78.0/src/kpackagelauncherqml/CMakeLists.txt 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/kpackagelauncherqml/CMakeLists.txt 2021-02-06 19:13:39.000000000 +0100 @@ -18,4 +18,4 @@ KF5::QuickAddons ) -install(TARGETS kpackagelauncherqml ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kpackagelauncherqml ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp new/kdeclarative-5.79.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -65,7 +65,7 @@ if (m_delegate != delegate) { //qDebug() << " ______________________________________________ " << delegate; m_delegate = delegate; - emit delegateChanged(); + Q_EMIT delegateChanged(); } } void DeclarativeDragArea::resetDelegate() @@ -86,7 +86,7 @@ { if (m_source != source) { m_source = source; - emit sourceChanged(); + Q_EMIT sourceChanged(); } } @@ -126,7 +126,7 @@ } m_startDragDistance = distance; - emit startDragDistanceChanged(); + Q_EMIT startDragDistanceChanged(); } // delegateImage @@ -149,7 +149,7 @@ m_delegateImage = image.value<QIcon>().pixmap(QSize(48, 48)).toImage(); } - emit delegateImageChanged(); + Q_EMIT delegateImageChanged(); } // enabled @@ -161,7 +161,7 @@ { if (enabled != m_enabled) { m_enabled = enabled; - emit enabledChanged(); + Q_EMIT enabledChanged(); } } @@ -174,7 +174,7 @@ { if (actions != m_supportedActions) { m_supportedActions = actions; - emit supportedActionsChanged(); + Q_EMIT supportedActionsChanged(); } } @@ -187,7 +187,7 @@ { if (action != m_defaultAction) { m_defaultAction = action; - emit defaultActionChanged(); + Q_EMIT defaultActionChanged(); } } @@ -356,15 +356,15 @@ //setCursor(Qt::OpenHandCursor); //TODO? Make a property for the cursor m_dragActive = true; - emit dragActiveChanged(); - emit dragStarted(); + Q_EMIT dragActiveChanged(); + Q_EMIT dragStarted(); Qt::DropAction action = drag->exec(m_supportedActions, m_defaultAction); setKeepMouseGrab(false); m_dragActive = false; - emit dragActiveChanged(); - emit drop(action); + Q_EMIT dragActiveChanged(); + Q_EMIT drop(action); ungrabMouse(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp new/kdeclarative-5.79.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -27,7 +27,7 @@ if (DeclarativeDropArea *da = qobject_cast<DeclarativeDropArea *>(candidate)) { da->m_temporaryInhibition = inhibit; if (inhibit) { - emit da->dragLeaveEvent(nullptr); + Q_EMIT da->dragLeaveEvent(nullptr); } } candidate = candidate->parentItem(); @@ -43,7 +43,7 @@ DeclarativeDragDropEvent dde(event, this); event->accept(); - emit dragEnter(&dde); + Q_EMIT dragEnter(&dde); if (!event->isAccepted()) { return; @@ -65,7 +65,7 @@ m_oldDragMovePos = QPoint(-1,-1); DeclarativeDragDropEvent dde(event, this); - emit dragLeave(&dde); + Q_EMIT dragLeave(&dde); setContainsDrag(false); } @@ -83,7 +83,7 @@ m_oldDragMovePos = event->pos(); DeclarativeDragDropEvent dde(event, this); - emit dragMove(&dde); + Q_EMIT dragMove(&dde); } void DeclarativeDropArea::dropEvent(QDropEvent *event) @@ -100,7 +100,7 @@ } DeclarativeDragDropEvent dde(event, this); - emit drop(&dde); + Q_EMIT drop(&dde); setContainsDrag(false); } @@ -117,7 +117,7 @@ m_enabled = enabled; setFlag(ItemAcceptsDrops, m_enabled); - emit enabledChanged(); + Q_EMIT enabledChanged(); } bool DeclarativeDropArea::preventStealing() const @@ -132,7 +132,7 @@ } m_preventStealing = prevent; - emit preventStealingChanged(); + Q_EMIT preventStealingChanged(); } void DeclarativeDropArea::setContainsDrag(bool dragging) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp new/kdeclarative-5.79.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -69,7 +69,7 @@ QList<QUrl> urlList; urlList.append(url); QMimeData::setUrls(urlList); - emit urlChanged(); + Q_EMIT urlChanged(); } QJsonArray DeclarativeMimeData::urls() const @@ -90,7 +90,7 @@ urlList << varUrl.toUrl(); } QMimeData::setUrls(urlList); - emit urlsChanged(); + Q_EMIT urlsChanged(); } // color @@ -112,7 +112,7 @@ { if (this->color() != color) { this->setColorData(color); - emit colorChanged(); + Q_EMIT colorChanged(); } } @@ -142,7 +142,7 @@ { if (m_source != source) { m_source = source; - emit sourceChanged(); + Q_EMIT sourceChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml --- old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2021-02-06 19:13:39.000000000 +0100 @@ -6,7 +6,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.2 as QtControls -import org.kde.kirigami 2.2 as Kirigami +import org.kde.kirigami 2.14 as Kirigami import org.kde.kcm 1.1 as KCM /** @@ -37,6 +37,9 @@ title: kcm.name + // Make pages fill the whole view by default + Kirigami.ColumnView.fillWidth: true + leftPadding: 6 // Layout_ChildMarginWidth from Breeze topPadding: headerParent.contentItem ? 0 : leftPadding rightPadding: leftPadding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml --- old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 2021-02-06 19:13:39.000000000 +0100 @@ -84,17 +84,15 @@ } return Kirigami.Theme.highlightColor; } else if (parent.hovered) { - return Kirigami.Theme.highlightColor; + // Match appearance of hovered list items + return Qt.rgba(Kirigami.Theme.highlightColor.r, + Kirigami.Theme.highlightColor.g, + Kirigami.Theme.highlightColor.b, + 0.5); } else { return Kirigami.Theme.backgroundColor; } } - Behavior on color { - ColorAnimation { - duration: Kirigami.Units.longDuration - easing.type: Easing.OutQuad - } - } Rectangle { id: thumbnailArea @@ -105,6 +103,8 @@ } color: Kirigami.Theme.backgroundColor + + // "None/There's nothing here" indicator Kirigami.Icon { visible: !delegate.thumbnailAvailable anchors.centerIn: parent @@ -116,18 +116,10 @@ Rectangle { anchors.fill: thumbnailArea - visible: actionsRow.children.length > 0 - opacity: Kirigami.Settings.isMobile || delegate.hovered || (actionsScope.focus) ? 1 : 0 + visible: actionsRow.children.length > 0 && (Kirigami.Settings.isMobile || delegate.hovered || (actionsScope.focus)) radius: delegate.thumbnailAvailable ? 0 : thumbnailArea.radius color: Kirigami.Settings.isMobile ? "transparent" : Qt.rgba(1, 1, 1, 0.2) - Behavior on opacity { - PropertyAnimation { - duration: Kirigami.Units.longDuration - easing.type: Easing.OutQuad - } - } - FocusScope { id: actionsScope @@ -182,6 +174,7 @@ Layout.maximumWidth: labelLayout.width text: delegate.text elide: Text.ElideRight + font.bold: delegate.GridView.isCurrentItem } Controls.Label { id: caption @@ -191,6 +184,7 @@ opacity: 0.6 text: delegate.subtitle font.pointSize: theme.smallestFont.pointSize + font.bold: delegate.GridView.isCurrentItem elide: Text.ElideRight } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml --- old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2021-02-06 19:13:39.000000000 +0100 @@ -6,7 +6,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.2 as QtControls -import org.kde.kirigami 2.2 as Kirigami +import org.kde.kirigami 2.14 as Kirigami import org.kde.kcm 1.1 as KCM /** @@ -36,6 +36,9 @@ title: kcm.name + // Make pages fill the whole view by default + Kirigami.ColumnView.fillWidth: true + leftPadding: 6 // Layout_ChildMarginWidth from Breeze topPadding: headerParent.contentItem ? 0 : leftPadding rightPadding: leftPadding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml --- old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml 2021-02-06 19:13:39.000000000 +0100 @@ -36,7 +36,7 @@ clip: true activeFocusOnTab: true - cellWidth: Math.floor(internal.availableWidth / Math.max(Math.floor(internal.availableWidth / (implicitCellWidth + Kirigami.Units.gridUnit)), 2)) + cellWidth: Math.floor(internal.availableWidth / Math.max(Math.floor(internal.availableWidth / (implicitCellWidth + Kirigami.Units.gridUnit)), (Kirigami.Settings.isMobile ? 1 : 2))) cellHeight: Kirigami.Settings.isMobile ? cellWidth/1.6 + Kirigami.Units.gridUnit : implicitCellHeight keyNavigationEnabled: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/settinghighlighterprivate.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -66,7 +66,7 @@ } m_target = target; - emit targetChanged(); + Q_EMIT targetChanged(); } bool SettingHighlighterPrivate::highlight() const @@ -82,7 +82,7 @@ m_highlight = highlight; updateTarget(); - emit highlightChanged(); + Q_EMIT highlightChanged(); } bool SettingHighlighterPrivate::defaultIndicatorVisible() const @@ -99,7 +99,7 @@ m_enabled = enabled; updateTarget(); - emit defaultIndicatorVisibleChanged(m_enabled); + Q_EMIT defaultIndicatorVisibleChanged(m_enabled); } void SettingHighlighterPrivate::updateTarget() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/settingstateproxy.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/settingstateproxy.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kcmcontrols/settingstateproxy.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kcmcontrols/settingstateproxy.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -26,7 +26,7 @@ } m_configObject = configObject; - emit configObjectChanged(); + Q_EMIT configObjectChanged(); updateState(); connectSetting(); } @@ -47,7 +47,7 @@ } m_settingName = settingName; - emit settingNameChanged(); + Q_EMIT settingNameChanged(); updateState(); connectSetting(); } @@ -70,12 +70,12 @@ if (m_immutable != immutable) { m_immutable = immutable; - emit immutableChanged(); + Q_EMIT immutableChanged(); } if (m_defaulted != defaulted) { m_defaulted = defaulted; - emit defaultedChanged(); + Q_EMIT defaultedChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -53,12 +53,12 @@ // make the Image reload. // Needs cache: false in the Image item to actually reload m_temporaryEmptyFaceIconPath = true; - emit faceIconUrlChanged(); + Q_EMIT faceIconUrlChanged(); m_temporaryEmptyFaceIconPath = false; - emit faceIconUrlChanged(); + Q_EMIT faceIconUrlChanged(); } else if (path == etcPasswd) { m_user = KUser(); - emit nameChanged(); + Q_EMIT nameChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml 2021-02-06 19:13:39.000000000 +0100 @@ -106,7 +106,7 @@ id: clearButton Layout.fillHeight: true Layout.preferredWidth: height - onClicked: root.keySequence = undefined + onClicked: root.keySequence = "" //icon name determines the direction of the arrow, NOT the direction of the app layout icon.name: Qt.application.layoutDirection == Qt.LeftToRight ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar-ltr" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrols/private/translationcontext.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrols/private/translationcontext.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrols/private/translationcontext.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrols/private/translationcontext.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -34,7 +34,7 @@ } m_domain = domain; - emit domainChanged(domain); + Q_EMIT domainChanged(domain); } QString TranslationContext::i18n(const QString &message, const QString ¶m1, const QString ¶m2, const QString ¶m3, const QString ¶m4, const QString ¶m5, const QString ¶m6, const QString ¶m7, const QString ¶m8, const QString ¶m9, const QString ¶m10) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -21,13 +21,13 @@ void Clipboard::setMode(QClipboard::Mode mode) { m_mode = mode; - emit modeChanged(m_mode); + Q_EMIT modeChanged(m_mode); } void Clipboard::clipboardChanged(QClipboard::Mode m) { if (m == m_mode) { - emit contentChanged(); + Q_EMIT contentChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -113,7 +113,7 @@ m_index = index; endResetModel(); - emit rootIndexChanged(); + Q_EMIT rootIndexChanged(); } QModelIndex ColumnProxyModel::indexFromModel(QAbstractItemModel* model, int row, int column, const QModelIndex& parent) @@ -168,7 +168,7 @@ void ColumnProxyModel::considerDataChanged(const QModelIndex& idxA, const QModelIndex& idxB) { if(idxA.parent()==m_index && idxB.parent()==m_index) { - emit dataChanged(proxyIndex(idxA), proxyIndex(idxB)); + Q_EMIT dataChanged(proxyIndex(idxA), proxyIndex(idxB)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/fallbacktaphandler.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/fallbacktaphandler.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/fallbacktaphandler.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/fallbacktaphandler.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -35,7 +35,7 @@ void FallbackTapHandler::setAcceptedButtons(Qt::MouseButtons buttons) { setAcceptedMouseButtons(buttons); - emit acceptedButtonsChanged(); + Q_EMIT acceptedButtonsChanged(); } bool FallbackTapHandler::childMouseEventFilter(QQuickItem *item, QEvent *event) @@ -50,7 +50,7 @@ QPointF mappedPoint = mapFromItem(item, me->pos()); FallbackTapHandlerMouseEvent eventProxy(me->button(), me->buttons(), me->modifiers(), mappedPoint.x(), mappedPoint.y()); - emit pressed(&eventProxy); + Q_EMIT pressed(&eventProxy); } else if (event->type() == QEvent::MouseButtonRelease && item->inherits("QQuickFlickable")) { QMouseEvent *me = static_cast<QMouseEvent *>(event); @@ -62,10 +62,10 @@ QPointF mappedPoint = mapFromItem(item, me->pos()); FallbackTapHandlerMouseEvent eventProxy(me->button(), me->buttons(), me->modifiers(), mappedPoint.x(), mappedPoint.y()); - emit released(&eventProxy); + Q_EMIT released(&eventProxy); if (QPointF(m_mouseDownPos - me->windowPos()).manhattanLength() < QGuiApplication::styleHints()->startDragDistance()) { - emit tapped(&eventProxy); + Q_EMIT tapped(&eventProxy); } m_mouseDownItem.clear(); @@ -87,7 +87,7 @@ m_mouseDownPos = event->windowPos(); FallbackTapHandlerMouseEvent eventProxy(event->button(), event->buttons(), event->modifiers(), event->x(), event->y()); - emit pressed(&eventProxy); + Q_EMIT pressed(&eventProxy); } void FallbackTapHandler::mouseReleaseEvent(QMouseEvent *event) @@ -100,13 +100,13 @@ FallbackTapHandlerMouseEvent eventProxy(event->button(), event->buttons(), event->modifiers(), event->x(), event->y()); if (QPointF(m_mouseDownPos - event->windowPos()).manhattanLength() < QGuiApplication::styleHints()->startDragDistance()) { - emit tapped(&eventProxy); + Q_EMIT tapped(&eventProxy); } m_mouseDownItem.clear(); m_mouseDownPos = QPointF(); - emit released(&eventProxy); + Q_EMIT released(&eventProxy); } #include "moc_fallbacktaphandler.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -26,7 +26,7 @@ connect(m_dialog.data(), &KIconDialog::newIconName, this, [this](const QString &newIconName) { if (m_iconName != newIconName) { m_iconName = newIconName; - emit iconNameChanged(newIconName); + Q_EMIT iconNameChanged(newIconName); } }); @@ -55,7 +55,7 @@ { if (m_dialog->iconSize() != iconSize) { m_iconSize = iconSize; - emit iconSizeChanged(iconSize); + Q_EMIT iconSizeChanged(iconSize); } } @@ -68,7 +68,7 @@ { if (m_dialog->windowTitle() != title) { m_dialog->setWindowTitle(title); - emit titleChanged(title); + Q_EMIT titleChanged(title); } } @@ -81,7 +81,7 @@ { if (m_user != user) { m_user = user; - emit userChanged(user); + Q_EMIT userChanged(user); } } @@ -96,7 +96,7 @@ m_dialog->setCustomLocation(customLocation); m_customLocation = customLocation; - emit customLocationChanged(customLocation); + Q_EMIT customLocationChanged(customLocation); } } @@ -109,7 +109,7 @@ { if (m_modality != modality) { m_modality = modality; - emit modalityChanged(modality); + Q_EMIT modalityChanged(modality); } } @@ -165,7 +165,7 @@ bool IconDialog::eventFilter(QObject *watched, QEvent *event) { if (watched == m_dialog.data() && (event->type() == QEvent::Show || event->type() == QEvent::Hide)) { - emit visibleChanged(); + Q_EMIT visibleChanged(); } return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -57,7 +57,7 @@ setCursor(shape); - emit cursorShapeChanged(); + Q_EMIT cursorShapeChanged(); } void MouseEventListener::setAcceptedButtons(Qt::MouseButtons buttons) @@ -67,7 +67,7 @@ } m_acceptedButtons = buttons; - emit acceptedButtonsChanged(); + Q_EMIT acceptedButtonsChanged(); } void MouseEventListener::setHoverEnabled(bool enable) @@ -77,7 +77,7 @@ } setAcceptHoverEvents(enable); - emit hoverEnabledChanged(enable); + Q_EMIT hoverEnabledChanged(enable); } bool MouseEventListener::hoverEnabled() const @@ -95,7 +95,7 @@ Q_UNUSED(event); m_containsMouse = true; - emit containsMouseChanged(true); + Q_EMIT containsMouseChanged(true); } void MouseEventListener::hoverLeaveEvent(QHoverEvent *event) @@ -103,7 +103,7 @@ Q_UNUSED(event); m_containsMouse = false; - emit containsMouseChanged(false); + Q_EMIT containsMouseChanged(false); } void MouseEventListener::hoverMoveEvent(QHoverEvent * event) @@ -119,7 +119,7 @@ } KDeclarativeMouseEvent dme(event->pos().x(), event->pos().y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, event->modifiers(), nullptr, Qt::MouseEventNotSynthesized); - emit positionChanged(&dme); + Q_EMIT positionChanged(&dme); } bool MouseEventListener::containsMouse() const @@ -154,8 +154,8 @@ } m_pressed = true; - emit pressed(&dme); - emit pressedChanged(); + Q_EMIT pressed(&dme); + Q_EMIT pressedChanged(); if (dme.isAccepted()) { me->setAccepted(true); @@ -177,7 +177,7 @@ } KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); - emit positionChanged(&dme); + Q_EMIT positionChanged(&dme); if (dme.isAccepted()) { me->setAccepted(true); @@ -193,11 +193,11 @@ KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); m_pressed = false; - emit released(&dme); - emit pressedChanged(); + Q_EMIT released(&dme); + Q_EMIT pressedChanged(); if (boundingRect().contains(me->pos()) && m_pressAndHoldTimer->isActive()) { - emit clicked(&dme); + Q_EMIT clicked(&dme); m_pressAndHoldTimer->stop(); } @@ -213,13 +213,13 @@ } KDeclarativeWheelEvent dwe(we->position().toPoint(), we->globalPosition().toPoint(), we->angleDelta(), we->buttons(), we->modifiers(), Qt::Vertical /* HACK, deprecated, remove */); - emit wheelMoved(&dwe); + Q_EMIT wheelMoved(&dwe); } void MouseEventListener::handlePressAndHold() { if (m_pressed) { - emit pressAndHold(m_pressAndHoldEvent); + Q_EMIT pressAndHold(m_pressAndHoldEvent); delete m_pressAndHoldEvent; m_pressAndHoldEvent = nullptr; @@ -256,8 +256,8 @@ //qDebug() << "pressed in sceneEventFilter"; m_buttonDownPos = me->screenPos(); m_pressed = true; - emit pressed(&dme); - emit pressedChanged(); + Q_EMIT pressed(&dme); + Q_EMIT pressedChanged(); if (dme.isAccepted()) { return true; @@ -283,7 +283,7 @@ KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, he->modifiers(), nullptr, Qt::MouseEventNotSynthesized); //qDebug() << "positionChanged..." << dme.x() << dme.y(); - emit positionChanged(&dme); + Q_EMIT positionChanged(&dme); if (dme.isAccepted()) { return true; @@ -311,7 +311,7 @@ delete m_pressAndHoldEvent; m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); } - emit positionChanged(&dme); + Q_EMIT positionChanged(&dme); if (dme.isAccepted()) { return true; @@ -326,11 +326,11 @@ KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); m_pressed = false; - emit released(&dme); - emit pressedChanged(); + Q_EMIT released(&dme); + Q_EMIT pressedChanged(); if (QPointF(me->screenPos() - m_buttonDownPos).manhattanLength() <= QGuiApplication::styleHints()->startDragDistance() && m_pressAndHoldTimer->isActive()) { - emit clicked(&dme); + Q_EMIT clicked(&dme); m_pressAndHoldTimer->stop(); } @@ -348,7 +348,7 @@ m_lastEvent = event; QWheelEvent *we = static_cast<QWheelEvent *>(event); KDeclarativeWheelEvent dwe(we->position().toPoint(), we->globalPosition().toPoint(), we->angleDelta(), we->buttons(), we->modifiers(), Qt::Vertical /* HACK, deprecated, remove */); - emit wheelMoved(&dwe); + Q_EMIT wheelMoved(&dwe); break; } default: @@ -390,8 +390,8 @@ m_pressAndHoldTimer->stop(); m_pressed = false; - emit pressedChanged(); + Q_EMIT pressedChanged(); - emit canceled(); + Q_EMIT canceled(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2021-02-06 19:13:39.000000000 +0100 @@ -66,7 +66,7 @@ void setAccepted(bool accepted) { if (m_accepted != accepted) { m_accepted = accepted; - emit acceptedChanged(); + Q_EMIT acceptedChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -51,7 +51,7 @@ m_color = color; - emit colorChanged(); + Q_EMIT colorChanged(); } QColor PlotData::color() const @@ -103,7 +103,7 @@ } m_label = label; - emit labelChanged(); + Q_EMIT labelChanged(); } void PlotData::addSample(qreal value) @@ -126,7 +126,7 @@ } } - emit valuesChanged(); + Q_EMIT valuesChanged(); } QList<qreal> PlotData::values() const @@ -351,7 +351,7 @@ m_mutex.unlock(); update(); - emit sampleSizeChanged(); + Q_EMIT sampleSizeChanged(); } bool Plotter::isStacked() const @@ -367,7 +367,7 @@ m_stacked = stacked; - emit stackedChanged(); + Q_EMIT stackedChanged(); update(); } @@ -384,7 +384,7 @@ m_autoRange = autoRange; - emit autoRangeChanged(); + Q_EMIT autoRangeChanged(); normalizeData(); update(); } @@ -406,7 +406,7 @@ m_rangeMax = max; - emit rangeMaxChanged(); + Q_EMIT rangeMaxChanged(); normalizeData(); update(); } @@ -428,7 +428,7 @@ m_rangeMin = min; - emit rangeMinChanged(); + Q_EMIT rangeMinChanged(); normalizeData(); update(); } @@ -441,7 +441,7 @@ m_gridColor = color; - emit gridColorChanged(); + Q_EMIT gridColorChanged(); } QColor Plotter::gridColor() const @@ -461,7 +461,7 @@ } m_horizontalLineCount = count; - emit horizontalGridLineCountChanged(); + Q_EMIT horizontalGridLineCountChanged(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -39,7 +39,7 @@ } m_changed = true; update(); - emit iconChanged(); + Q_EMIT iconChanged(); } QIcon QIconItem::icon() const @@ -60,7 +60,7 @@ m_state = state; m_changed = true; - emit stateChanged(state); + Q_EMIT stateChanged(state); update(); } @@ -96,7 +96,7 @@ m_smooth = smooth; m_changed = true; update(); - emit smoothChanged(); + Q_EMIT smoothChanged(); } bool QIconItem::smooth() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -29,11 +29,11 @@ m_image = image; updatePaintedRect(); update(); - emit nativeWidthChanged(); - emit nativeHeightChanged(); - emit imageChanged(); + Q_EMIT nativeWidthChanged(); + Q_EMIT nativeHeightChanged(); + Q_EMIT imageChanged(); if (oldImageNull != m_image.isNull()) { - emit nullChanged(); + Q_EMIT nullChanged(); } } @@ -85,7 +85,7 @@ m_fillMode = mode; updatePaintedRect(); update(); - emit fillModeChanged(); + Q_EMIT fillModeChanged(); } void QImageItem::paint(QPainter *painter) @@ -183,8 +183,8 @@ if (destRect != sourceRect) { m_paintedRect = destRect.toRect(); - emit paintedHeightChanged(); - emit paintedWidthChanged(); + Q_EMIT paintedHeightChanged(); + Q_EMIT paintedWidthChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp --- old/kdeclarative-5.78.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -30,11 +30,11 @@ m_pixmap = pixmap; updatePaintedRect(); update(); - emit nativeWidthChanged(); - emit nativeHeightChanged(); - emit pixmapChanged(); + Q_EMIT nativeWidthChanged(); + Q_EMIT nativeHeightChanged(); + Q_EMIT pixmapChanged(); if (oldPixmapNull != m_pixmap.isNull()) { - emit nullChanged(); + Q_EMIT nullChanged(); } } @@ -86,7 +86,7 @@ m_fillMode = mode; updatePaintedRect(); update(); - emit fillModeChanged(); + Q_EMIT fillModeChanged(); } @@ -187,8 +187,8 @@ if (destRect != sourceRect) { m_paintedRect = destRect.toRect(); - emit paintedHeightChanged(); - emit paintedWidthChanged(); + Q_EMIT paintedHeightChanged(); + Q_EMIT paintedWidthChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt new/kdeclarative-5.79.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt --- old/kdeclarative-5.78.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt 2021-02-06 19:13:39.000000000 +0100 @@ -12,6 +12,6 @@ KF5::WindowSystem ) -install(TARGETS kwindowsystem DESTINATION ${QML_INSTALL_DIR}/org/kde/kwindowsystem) +install(TARGETS kwindowsystem DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwindowsystem) -install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kwindowsystem) +install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwindowsystem) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/quickaddons/configmodule.cpp new/kdeclarative-5.79.0/src/quickaddons/configmodule.cpp --- old/kdeclarative-5.78.0/src/quickaddons/configmodule.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/quickaddons/configmodule.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -213,8 +213,8 @@ } d->subPages << item; - emit pagePushed(item); - emit depthChanged(depth()); + Q_EMIT pagePushed(item); + Q_EMIT depthChanged(depth()); setCurrentIndex(d->currentIndex + 1); } @@ -226,8 +226,8 @@ } d->subPages << item; - emit pagePushed(item); - emit depthChanged(depth()); + Q_EMIT pagePushed(item); + Q_EMIT depthChanged(depth()); setCurrentIndex(d->currentIndex + 1); } @@ -237,8 +237,8 @@ return; } QQuickItem *page = d->subPages.takeLast(); - emit pageRemoved(); - emit depthChanged(depth()); + Q_EMIT pageRemoved(); + Q_EMIT depthChanged(depth()); page->deleteLater(); setCurrentIndex(qMin(d->currentIndex, depth() - 1)); @@ -246,7 +246,7 @@ void ConfigModule::showPassiveNotification(const QString &message, const QVariant &timeout, const QString &actionText, const QJSValue &callBack) { - emit passiveNotificationRequested(message, timeout, actionText, callBack); + Q_EMIT passiveNotificationRequested(message, timeout, actionText, callBack); } ConfigModule::Buttons ConfigModule::buttons() const @@ -261,7 +261,7 @@ } d->_buttons = buttons; - emit buttonsChanged(); + Q_EMIT buttonsChanged(); } void ConfigModule::setNeedsAuthorization(bool needsAuth) @@ -279,8 +279,8 @@ d->_authActionName = QString(); } - emit needsAuthorizationChanged(); - emit authActionNameChanged(); + Q_EMIT needsAuthorizationChanged(); + Q_EMIT authActionNameChanged(); } bool ConfigModule::needsAuthorization() const @@ -310,7 +310,7 @@ } d->_columnWidth = width; - emit columnWidthChanged(width); + Q_EMIT columnWidthChanged(width); } int ConfigModule::depth() const @@ -326,7 +326,7 @@ d->currentIndex = index; - emit currentIndexChanged(index); + Q_EMIT currentIndexChanged(index); } int ConfigModule::currentIndex() const @@ -343,8 +343,8 @@ d->_authActionName = name; d->_needsAuthorization = true; - emit needsAuthorizationChanged(); - emit authActionNameChanged(); + Q_EMIT needsAuthorizationChanged(); + Q_EMIT authActionNameChanged(); } QString ConfigModule::authActionName() const @@ -405,7 +405,7 @@ } d->_rootOnlyMessage = message; - emit rootOnlyMessageChanged(); + Q_EMIT rootOnlyMessageChanged(); } QString ConfigModule::rootOnlyMessage() const @@ -421,7 +421,7 @@ d->_useRootOnlyMessage = on; - emit useRootOnlyMessageChanged(); + Q_EMIT useRootOnlyMessageChanged(); } bool ConfigModule::useRootOnlyMessage() const @@ -442,7 +442,7 @@ d->_quickHelp = help; - emit quickHelpChanged(); + Q_EMIT quickHelpChanged(); } QString ConfigModule::quickHelp() const @@ -457,7 +457,7 @@ } d->_needsSave = needs; - emit needsSaveChanged(); + Q_EMIT needsSaveChanged(); } bool ConfigModule::needsSave() @@ -472,7 +472,7 @@ } d->_representsDefaults = defaults; - emit representsDefaultsChanged(); + Q_EMIT representsDefaultsChanged(); } bool ConfigModule::representsDefaults() @@ -491,7 +491,7 @@ return; } d->_defaultsIndicatorVisible = visible; - emit defaultsIndicatorsVisibleChanged(); + Q_EMIT defaultsIndicatorsVisibleChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/quickaddons/managedconfigmodule.h new/kdeclarative-5.79.0/src/quickaddons/managedconfigmodule.h --- old/kdeclarative-5.78.0/src/quickaddons/managedconfigmodule.h 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/quickaddons/managedconfigmodule.h 2021-02-06 19:13:39.000000000 +0100 @@ -32,7 +32,7 @@ * the module author. * * To write a config module, you have to create a C++ library - * and an accompaning QML user interface. + * and an accompanying QML user interface. * The library must contain a factory function like the following: * * \code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.78.0/src/quickaddons/quickviewsharedengine.cpp new/kdeclarative-5.79.0/src/quickaddons/quickviewsharedengine.cpp --- old/kdeclarative-5.78.0/src/quickaddons/quickviewsharedengine.cpp 2021-01-02 14:11:10.000000000 +0100 +++ new/kdeclarative-5.79.0/src/quickaddons/quickviewsharedengine.cpp 2021-02-06 19:13:39.000000000 +0100 @@ -203,7 +203,7 @@ d->resizeMode = mode; - emit resizeModeChanged(mode); + Q_EMIT resizeModeChanged(mode); QQuickItem *item = qobject_cast<QQuickItem *>(d->qmlObject->rootObject()); if (!item) { @@ -220,7 +220,7 @@ } d->qmlObject->setSource(url); - emit sourceChanged(url); + Q_EMIT sourceChanged(url); } QUrl QuickViewSharedEngine::source() const
