Hello community,
here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2018-05-18 14:20:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old)
and /work/SRC/openSUSE:Factory/.kdeclarative.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative"
Fri May 18 14:20:01 2018 rev:55 rq:607547 version:5.46.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2018-04-19 15:15:51.672047138 +0200
+++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2018-05-18 14:20:25.578834532 +0200
@@ -1,0 +2,20 @@
+Sun May 13 21:03:01 UTC 2018 - lbeltrame@kde.org
+
+- Update to 5.46.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.46.0.php
+- Changes since 5.45.0:
+ * Load NV graphics reset based on config
+ * ScrollViewKCM
+ * [KUserProxy] Adjust to accounts service (kde#384107)
+ * Plasma mobile optimizations
+ * Make room for footer and header.
+ * base on the proper tooltip
+ * don't use tooltips if empty
+ * new resize policy (kde#391910)
+ * Warning--
+ * support actions visibility
+ * Support nvidia reset notifications in QtQuickViews
+
+-------------------------------------------------------------------
Old:
----
kdeclarative-5.45.0.tar.xz
New:
----
kdeclarative-5.46.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeclarative.spec ++++++
--- /var/tmp/diff_new_pack.APhISJ/_old 2018-05-18 14:20:26.358805909 +0200
+++ /var/tmp/diff_new_pack.APhISJ/_new 2018-05-18 14:20:26.362805762 +0200
@@ -18,13 +18,13 @@
%bcond_without lang
%define lname libKF5Declarative5
-%define _tar_path 5.45
+%define _tar_path 5.46
# 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
Name: kdeclarative
-Version: 5.45.0
+Version: 5.46.0
Release: 0
%define kf5_version %{version}
Summary: Integration of QML and KDE workspaces
++++++ kdeclarative-5.45.0.tar.xz -> kdeclarative-5.46.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/CMakeLists.txt new/kdeclarative-5.46.0/CMakeLists.txt
--- old/kdeclarative-5.45.0/CMakeLists.txt 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/CMakeLists.txt 2018-05-05 14:56:38.000000000 +0200
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.45.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.45.0") # handled by release scripts
+set(KF5_VERSION "5.46.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.46.0") # handled by release scripts
project(KDeclarative VERSION ${KF5_VERSION})
# Dependencies
include(FeatureSummary)
-find_package(ECM 5.45.0 NO_MODULE)
+find_package(ECM 5.46.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/po/gl/kdeclarative5.po new/kdeclarative-5.46.0/po/gl/kdeclarative5.po
--- old/kdeclarative-5.45.0/po/gl/kdeclarative5.po 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/po/gl/kdeclarative5.po 2018-05-05 14:56:38.000000000 +0200
@@ -10,20 +10,21 @@
# Xosé , 2010.
# Marce Villarino , 2011, 2012, 2013, 2014.
# Adrián Chaves Fernández , 2015.
+# Adrian Chaves , 2018.
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-11-30 03:07+0100\n"
-"PO-Revision-Date: 2015-03-14 06:28+0100\n"
-"Last-Translator: Adrián Chaves Fernández \n"
+"PO-Revision-Date: 2018-04-21 20:08+0100\n"
+"Last-Translator: Adrian Chaves \n"
"Language-Team: Galician \n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
"X-Environment: kde, development\n"
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
@@ -41,7 +42,7 @@
#: kpackagelauncherqml/main.cpp:43
#, kde-format
msgid "KPackage QML application shell"
-msgstr "Shell de aplicativos en QML de KPackage"
+msgstr "Intérprete de ordes de aplicativos en QML de KPackage"
#: kpackagelauncherqml/main.cpp:50
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.46.0/po/zh_CN/kdeclarative5.po
--- old/kdeclarative-5.45.0/po/zh_CN/kdeclarative5.po 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/po/zh_CN/kdeclarative5.po 2018-05-05 14:56:38.000000000 +0200
@@ -15,7 +15,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-11-30 03:07+0100\n"
-"PO-Revision-Date: 2018-04-05 09:22-0400\n"
+"PO-Revision-Date: 2018-04-26 05:22-0400\n"
"Last-Translator: guoyunhebrave \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/calendarevents/eventdata_p.cpp new/kdeclarative-5.46.0/src/calendarevents/eventdata_p.cpp
--- old/kdeclarative-5.45.0/src/calendarevents/eventdata_p.cpp 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/calendarevents/eventdata_p.cpp 2018-05-05 14:56:38.000000000 +0200
@@ -23,7 +23,7 @@
class CalendarEvents::EventData::Private : public QSharedData {
public:
- Private() : isAllDay(false), isMinor(false) {};
+ Private() : isAllDay(false), isMinor(false) {}
Private(const Private &other)
: QSharedData(other)
{
@@ -36,8 +36,8 @@
type = other.type;
isAllDay = other.isAllDay;
isMinor = other.isMinor;
- };
- ~Private() {};
+ }
+ ~Private() {}
QDateTime startDateTime; // Start of the event
QDateTime endDateTime; // End of the event
QString title; // Title of the event
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/kdeclarative/configpropertymap.h new/kdeclarative-5.46.0/src/kdeclarative/configpropertymap.h
--- old/kdeclarative-5.45.0/src/kdeclarative/configpropertymap.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/kdeclarative/configpropertymap.h 2018-05-05 14:56:38.000000000 +0200
@@ -42,7 +42,7 @@
public:
ConfigPropertyMap(KCoreConfigSkeleton *config, QObject *parent = nullptr);
- ~ConfigPropertyMap();
+ ~ConfigPropertyMap() override;
/**
* @brief Whether the value at the given key is immutable
@@ -52,7 +52,7 @@
Q_INVOKABLE bool isImmutable(const QString &key) const;
protected:
- QVariant updateValue(const QString &key, const QVariant &input) Q_DECL_OVERRIDE;
+ QVariant updateValue(const QString &key, const QVariant &input) override;
private:
ConfigPropertyMapPrivate *const d;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/kdeclarative/private/kiconprovider_p.h new/kdeclarative-5.46.0/src/kdeclarative/private/kiconprovider_p.h
--- old/kdeclarative-5.45.0/src/kdeclarative/private/kiconprovider_p.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/kdeclarative/private/kiconprovider_p.h 2018-05-05 14:56:38.000000000 +0200
@@ -27,7 +27,7 @@
public:
KIconProvider();
- QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE;
+ QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/kdeclarative/private/kioaccessmanagerfactory_p.h new/kdeclarative-5.46.0/src/kdeclarative/private/kioaccessmanagerfactory_p.h
--- old/kdeclarative-5.45.0/src/kdeclarative/private/kioaccessmanagerfactory_p.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/kdeclarative/private/kioaccessmanagerfactory_p.h 2018-05-05 14:56:38.000000000 +0200
@@ -29,7 +29,7 @@
public:
KIOAccessManagerFactory();
~KIOAccessManagerFactory();
- QNetworkAccessManager *create(QObject *parent) Q_DECL_OVERRIDE;
+ QNetworkAccessManager *create(QObject *parent) override;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/kdeclarative/qmlobject.cpp new/kdeclarative-5.46.0/src/kdeclarative/qmlobject.cpp
--- old/kdeclarative-5.45.0/src/kdeclarative/qmlobject.cpp 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/kdeclarative/qmlobject.cpp 2018-05-05 14:56:38.000000000 +0200
@@ -42,7 +42,7 @@
public:
QVariantHash m_initialProperties;
protected:
- void setInitialState(QObject *object) Q_DECL_OVERRIDE
+ void setInitialState(QObject *object) override
{
QHashIterator i(m_initialProperties);
while (i.hasNext()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.h 2018-05-05 14:56:38.000000000 +0200
@@ -97,7 +97,7 @@
public:
DeclarativeDragArea(QQuickItem *parent=nullptr);
- ~DeclarativeDragArea();
+ ~DeclarativeDragArea() override;
QQuickItem *delegate() const;
void setDelegate(QQuickItem* delegate);
@@ -143,11 +143,11 @@
void delegateImageChanged();
protected:
- void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
- void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
- void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE;
- void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
- bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *) override;
+ void timerEvent(QTimerEvent *event) override;
+ bool childMouseEventFilter(QQuickItem *item, QEvent *event) override;
private:
void startDrag(const QImage &image);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp
--- old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp 2018-05-05 14:56:38.000000000 +0200
@@ -50,7 +50,7 @@
void DeclarativeDragDropEvent::accept(int action)
{
- m_event->setDropAction( (Qt::DropAction) action );
+ m_event->setDropAction( static_castQt::DropAction(action) );
// qDebug() << "-----> Accepting event: " << this << m_data.urls() << m_data.text() << m_data.html() << ( m_data.hasColor() ? m_data.color().name() : " no color");
m_event->accept();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h 2018-05-05 14:56:38.000000000 +0200
@@ -90,10 +90,10 @@
void containsDragChanged(bool contained);
protected:
- void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
- void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE;
- void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
- void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent *event) override;
+ void dragLeaveEvent(QDragLeaveEvent *event) override;
+ void dragMoveEvent(QDragMoveEvent *event) override;
+ void dropEvent(QDropEvent *event) override;
private Q_SLOTS:
void temporaryInhibitParent(bool inhibit);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/draganddropplugin.h new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/draganddropplugin.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/draganddrop/draganddropplugin.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/draganddrop/draganddropplugin.h 2018-05-05 14:56:38.000000000 +0200
@@ -31,7 +31,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+ void registerTypes(const char *uri) override;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h 2018-05-05 14:56:38.000000000 +0200
@@ -31,7 +31,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+ void registerTypes(const char *uri) override;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 2018-05-05 14:56:38.000000000 +0200
@@ -59,19 +59,18 @@
*/
property list<QtObject> actions
- width: view.cellWidth
- height: view.cellHeight
+ width: GridView.view.cellWidth
+ height: GridView.view.cellHeight
hoverEnabled: true
Rectangle {
id: thumbnail
anchors {
- left: parent.left
- right: parent.right
- top: parent.top
- margins: Kirigami.Units.smallSpacing * 2
+ centerIn: parent
+ verticalCenterOffset: -label.height/2
}
- height: width/1.6
+ width: Kirigami.Settings.isMobile ? delegate.width - Kirigami.Units.gridUnit : Math.min(delegate.GridView.view.implicitCellWidth, delegate.width - Kirigami.Units.gridUnit)
+ height: width / 1.6
radius: Kirigami.Units.smallSpacing
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.View
@@ -113,9 +112,9 @@
Rectangle {
anchors.fill: parent
visible: actionsRow.children.length > 0
- opacity: delegate.hovered || (actionsScope.focus) ? 1 : 0
+ opacity: Kirigami.Settings.isMobile || delegate.hovered || (actionsScope.focus) ? 1 : 0
radius: Kirigami.Units.smallSpacing
- color: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
+ color: Kirigami.Settings.isMobile ? "transparent" : Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
@@ -153,10 +152,11 @@
activeFocusOnTab: focus || delegate.focus
onClicked: modelData.trigger()
enabled: modelData.enabled
+ visible: modelData.visible
//NOTE: there aren't any global settings where to take "official" tooltip timeouts
Controls.ToolTip.delay: 1000
Controls.ToolTip.timeout: 5000
- Controls.ToolTip.visible: hovered
+ Controls.ToolTip.visible: (Kirigami.Settings.isMobile ? pressed : hovered) && modelData.tooltip.length > 0
Controls.ToolTip.text: modelData.tooltip
}
}
@@ -174,6 +174,7 @@
}
Controls.Label {
+ id: label
anchors {
left: parent.left
right: parent.right
@@ -186,6 +187,6 @@
}
Controls.ToolTip.delay: 1000
Controls.ToolTip.timeout: 5000
- Controls.ToolTip.visible: hovered
+ Controls.ToolTip.visible: hovered && delegate.toolTip.length > 0
Controls.ToolTip.text: toolTip
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml 2018-05-05 14:56:38.000000000 +0200
@@ -45,9 +45,6 @@
*/
property alias view: view
-
- implicitWidth: Math.max(view.cellWidth * 2 + internal.scrollBarSpace
- , Math.floor(internal.availableWidth / view.cellWidth) * view.cellWidth + internal.scrollBarSpace + 4)
activeFocusOnTab: false
Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false
@@ -57,23 +54,25 @@
GridView {
id: view
property int implicitCellWidth: Kirigami.Units.gridUnit * 10
- property int implicitCellHeight: Math.round(implicitCellWidth / 1.6) + Kirigami.Units.gridUnit
+ property int implicitCellHeight: Math.round(implicitCellWidth / 1.6) + Kirigami.Units.gridUnit*2
+
+ onCurrentIndexChanged: positionViewAtIndex(currentIndex, GridView.Contain);
+
QtObject {
id: internal
- readonly property int availableWidth: scroll.parent.width - internal.scrollBarSpace - 4
+ readonly property int availableWidth: scroll.width - internal.scrollBarSpace - 4
readonly property int scrollBarSpace: scroll.QtControls.ScrollBar.vertical.width
}
anchors {
fill: parent
margins: 2
- leftMargin: contentHeight <= height ? internal.scrollBarSpace/2 : 2
- rightMargin: contentHeight <= height ? internal.scrollBarSpace/2 : internal.scrollBarSpace + 2
+ leftMargin: scroll.QtControls.ScrollBar.vertical.visible ? 2 : internal.scrollBarSpace/2 + 2
}
clip: true
activeFocusOnTab: true
- cellWidth: Math.min(Math.floor(internal.availableWidth / 2), implicitCellWidth)
- cellHeight: Math.round(cellWidth / 1.6) + Kirigami.Units.gridUnit
+ cellWidth: Math.floor(internal.availableWidth / Math.max(Math.floor(internal.availableWidth / (implicitCellWidth + Kirigami.Units.gridUnit)), 2))
+ cellHeight: Kirigami.Settings.isMobile ? cellWidth/1.6 + Kirigami.Units.gridUnit : implicitCellHeight
keyNavigationEnabled: true
keyNavigationWraps: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 2018-05-05 14:56:38.000000000 +0200
@@ -61,19 +61,43 @@
title: kcm.name
implicitWidth: view.implicitCellWidth * 3 + scroll.QtControls.ScrollBar.vertical.width + Kirigami.Units.gridUnit
implicitHeight: view.implicitCellHeight * 3 + (header ? header.height : 0) + (footer ? footer.height : 0) + Kirigami.Units.gridUnit
+ flickable: scroll.view
- topPadding: 0
- leftPadding: 0
- rightPadding: 0
- bottomPadding: footer ? Kirigami.Units.smallSpacing : 0
+ //NOTE: this should be smallspacing buit we need a pixel size in order to align with systemsettings widgets
+ leftPadding: Kirigami.Settings.isMobile ? 0 : headerParent.leftPadding
+ topPadding: headerParent.contentItem ? 0 : leftPadding
+ rightPadding: leftPadding
+ bottomPadding: footerParent.contentItem ? 0 : leftPadding
+ header: QtControls.Control {
+ id: headerParent
+ }
+
+ footer: QtControls.Control {
+ id: footerParent
+ }
+ Component.onCompleted: {
+ if (footer && footer != footerParent) {
+ var f = footer
+
+ footerParent.contentItem = f
+ footer = footerParent
+ f.visible = true
+ f.parent = footerParent
+ }
+
+ if (header && header != headerParent) {
+ var f = header
+
+ headerParent.contentItem = f
+ header = headerParent
+ f.visible = true
+ f.parent = headerParent
+ }
+ }
+
KCM.GridView {
id: scroll
- width: Math.min(implicitWidth, root.width)
- anchors {
- top: parent.top
- bottom: parent.bottom
- horizontalCenter: parent.horizontalCenter
- }
+ anchors.fill: parent
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/ScrollView.qml 2018-05-05 14:56:38.000000000 +0200
@@ -0,0 +1,57 @@
+/*
+ Copyright (c) 2018 Marco Martin
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.2 as QtControls
+import org.kde.kirigami 2.3 as Kirigami
+
+/**
+ * A ScrollView containing a GridView, with the default behavior about
+ * sizing and background as recomended by the user interface guidelines
+ * For most KControl modules, it's recomended to use instead the GridViewKCM
+ * component as the root element of your module.
+ * @code
+ * import org.kde.kcm 1.2 as KCM
+ * KCM.ScrollView {
+ * view: ListView {
+ * ...
+ * }
+ * }
+ * @endcode
+ * @see GridViewKCM
+ */
+QtControls.ScrollView {
+ id: scroll
+
+ /**
+ * view: GridView
+ * Exposes the internal flickable
+ */
+ property Flickable view
+ onViewChanged: view.parent = scroll;
+
+ activeFocusOnTab: false
+ Kirigami.Theme.colorSet: Kirigami.Theme.View
+ Kirigami.Theme.inherit: false
+
+ Component.onCompleted: scroll.background.visible = true;
+
+
+ QtControls.ScrollBar.horizontal.visible: false
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml 2018-05-05 14:56:38.000000000 +0200
@@ -0,0 +1,95 @@
+/*
+ Copyright (c) 2017 Marco Martin
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.2 as QtControls
+import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kcm 1.1 as KCM
+import "." as Priv
+
+/**
+ * This component is intended to be used as the root item for most of the
+ * KControl modules which are based upon a list view or another vertical flickable
+ * It has a big GridView as its main item, the implementation is free to add extra
+ * content in the header or footer properties.
+ * @code
+ * import org.kde.kcm 1.2 as KCM
+ * KCM.ScrollViewKCM {
+ * header: Item {...}
+ * view: ListView {
+ * ...
+ * }
+ * footer: Item {...}
+ * }
+ * @endcode
+ * @inherits org.kde.kirigami.Page
+ */
+Kirigami.Page {
+ id: root
+
+ /**
+ * view: GridView
+ * Exposes the internal flickable
+ */
+ property alias view: scroll.view
+
+ title: kcm.name
+ //implicitWidth: Kirigami.Units.gridUnit * 30
+ //implicitHeight: Kirigami.Units.gridUnit * 40
+ //flickable: scroll.view
+
+ //NOTE: this should be smallspacing buit we need a pixel size in order to align with systemsettings widgets
+ leftPadding: Kirigami.Settings.isMobile ? 0 : 4
+ topPadding: headerParent.contentItem ? 0 : leftPadding
+ rightPadding: leftPadding
+ bottomPadding: footerParent.contentItem ? 0 : leftPadding
+
+ header: QtControls.Control {
+ id: headerParent
+ padding: 4
+ }
+
+ footer: QtControls.Control {
+ id: footerParent
+ padding: 4
+ }
+ Component.onCompleted: {
+ if (footer && footer != footerParent) {
+ var f = footer
+
+ footerParent.contentItem = f
+ footer = footerParent
+ f.visible = true
+ f.parent = footerParent
+ }
+
+ if (header && header != headerParent) {
+ var f = header
+
+ headerParent.contentItem = f
+ header = headerParent
+ f.visible = true
+ f.parent = headerParent
+ }
+ }
+ Priv.ScrollView {
+ id: scroll
+ anchors.fill: parent
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2018-05-05 14:56:38.000000000 +0200
@@ -56,6 +56,7 @@
left: parent.left
right: parent.right
top: parent.top
+ topMargin: root.header ? root.header.height : 0
}
visible: !root.flickable.atYBeginning
},
@@ -65,6 +66,7 @@
left: parent.left
right: parent.right
bottom: parent.bottom
+ bottomMargin: root.footer ? root.footer.height : 0
}
visible: !root.flickable.atYEnd
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/qmldir new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/qmldir
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcmcontrols/qml/qmldir 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcmcontrols/qml/qmldir 2018-05-05 14:56:38.000000000 +0200
@@ -4,4 +4,5 @@
GridDelegate 1.1 GridDelegate.qml
GridViewKCM 1.1 GridViewKCM.qml
GridView 1.1 GridView.qml
+ScrollViewKCM 1.2 ScrollViewKCM.qml
SimpleKCM 1.1 SimpleKCM.qml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcoreaddons/kcoreaddonsplugin.h new/kdeclarative-5.46.0/src/qmlcontrols/kcoreaddons/kcoreaddonsplugin.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcoreaddons/kcoreaddonsplugin.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcoreaddons/kcoreaddonsplugin.h 2018-05-05 14:56:38.000000000 +0200
@@ -29,7 +29,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+ void registerTypes(const char *uri) override;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp new/kdeclarative-5.46.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp
--- old/kdeclarative-5.45.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2018-05-05 14:56:38.000000000 +0200
@@ -31,6 +31,7 @@
#include <QDebug>
const QString etcPasswd = QStringLiteral("/etc/passwd");
+const QString accountsServiceIconPath = QStringLiteral("/var/lib/AccountsService/icons");
KUserProxy::KUserProxy (QObject *parent)
: QObject(parent),
@@ -45,12 +46,14 @@
}
m_dirWatch.addFile(pathToFaceIcon);
+ m_dirWatch.addFile(accountsServiceIconPath + QLatin1Char('/') + m_user.loginName());
if (QFile::exists(etcPasswd)) {
m_dirWatch.addFile(etcPasswd);
}
connect(&m_dirWatch, &KDirWatch::dirty, this, &KUserProxy::update);
connect(&m_dirWatch, &KDirWatch::created, this, &KUserProxy::update);
+ connect(&m_dirWatch, &KDirWatch::deleted, this, &KUserProxy::update);
}
KUserProxy::~KUserProxy()
@@ -59,7 +62,8 @@
void KUserProxy::update(const QString &path)
{
- if (path == m_user.faceIconPath()) {
+ if (path == m_user.faceIconPath() || path == QDir::homePath() + QLatin1String("/.face.icon")
+ || path == accountsServiceIconPath + QLatin1Char('/') + m_user.loginName()) {
// we need to force updates, even when the path doesn't change,
// but the underlying image does. Change path temporarily, to
// make the Image reload.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kioplugin/kioplugin.h new/kdeclarative-5.46.0/src/qmlcontrols/kioplugin/kioplugin.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kioplugin/kioplugin.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kioplugin/kioplugin.h 2018-05-05 14:56:38.000000000 +0200
@@ -27,7 +27,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+ void registerTypes(const char *uri) override;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrols/private/kquickcontrolsprivateplugin.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrols/private/kquickcontrolsprivateplugin.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrols/private/kquickcontrolsprivateplugin.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrols/private/kquickcontrolsprivateplugin.h 2018-05-05 14:56:38.000000000 +0200
@@ -28,7 +28,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+ void registerTypes(const char *uri) override;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h 2018-05-05 14:56:38.000000000 +0200
@@ -43,12 +43,12 @@
Q_SCRIPTABLE static QModelIndex indexFromModel(QAbstractItemModel* model, int row, int column=0, const QModelIndex& parent=QModelIndex());
Q_SCRIPTABLE QModelIndex indexAt(int row, const QModelIndex& parent = QModelIndex()) const;
- QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
- QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- QHash roleNames() const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+ QHash roleNames() const override;
- bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
+ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
Q_SIGNALS:
void rootIndexChanged();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp 2018-05-05 14:56:38.000000000 +0200
@@ -52,7 +52,7 @@
default:
return;
}
- QMouseEvent ev(eventType, QPointF(x, y), (Qt::MouseButton)button, buttons, modifiers);
+ QMouseEvent ev(eventType, QPointF(x, y), static_castQt::MouseButton(button), buttons, modifiers);
QGuiApplication::sendEvent(item, &ev);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/icondialog.h 2018-05-05 14:56:38.000000000 +0200
@@ -62,7 +62,7 @@
public:
explicit IconDialog(QObject *parent = nullptr);
- virtual ~IconDialog();
+ ~IconDialog() override;
QString iconName() const;
@@ -97,7 +97,7 @@
void visibleChanged();
private:
- bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
+ bool eventFilter(QObject *watched, QEvent *event) override;
QScopedPointer<KIconDialog> m_dialog;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/kquickcontrolsaddonsplugin.h 2018-05-05 14:56:38.000000000 +0200
@@ -31,7 +31,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+ void registerTypes(const char *uri) override;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2018-05-05 14:56:38.000000000 +0200
@@ -177,7 +177,7 @@
public:
MouseEventListener(QQuickItem *parent=nullptr);
- ~MouseEventListener();
+ ~MouseEventListener() override;
bool containsMouse() const;
void setHoverEnabled(bool enable);
@@ -191,16 +191,16 @@
void setCursorShape(Qt::CursorShape shape);
protected:
- void hoverEnterEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
- void hoverLeaveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
- void hoverMoveEvent(QHoverEvent * event) Q_DECL_OVERRIDE;
- void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
- void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
- void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
- void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
- bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE;
- void mouseUngrabEvent() Q_DECL_OVERRIDE;
- void touchUngrabEvent() Q_DECL_OVERRIDE;
+ void hoverEnterEvent(QHoverEvent *event) override;
+ void hoverLeaveEvent(QHoverEvent *event) override;
+ void hoverMoveEvent(QHoverEvent * event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
+ void wheelEvent(QWheelEvent *event) override;
+ bool childMouseEventFilter(QQuickItem *item, QEvent *event) override;
+ void mouseUngrabEvent() override;
+ void touchUngrabEvent() override;
Q_SIGNALS:
void pressed(KDeclarativeMouseEvent *mouse);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2018-05-05 14:56:38.000000000 +0200
@@ -188,7 +188,7 @@
{
public:
PlotTexture(QOpenGLContext *ctx);
- ~PlotTexture();
+ ~PlotTexture() override;
void bind() override final;
bool hasAlphaChannel() const override final { return true; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2018-05-05 14:56:38.000000000 +0200
@@ -217,7 +217,7 @@
Q_INVOKABLE void addSample(const QList<qreal> &value);
protected:
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
private:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override final;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h 2018-05-05 14:56:38.000000000 +0200
@@ -45,8 +45,8 @@
};
Q_ENUM(State)
- QIconItem(QQuickItem *parent=nullptr);
- ~QIconItem();
+ explicit QIconItem(QQuickItem *parent=nullptr);
+ ~QIconItem() override;
void setIcon(const QVariant &icon);
QIcon icon() const;
@@ -63,7 +63,7 @@
void setEnabled(bool enabled = true);
bool enabled() const;
- QSGNode* updatePaintNode(QSGNode* node, UpdatePaintNodeData* data) Q_DECL_OVERRIDE;
+ QSGNode* updatePaintNode(QSGNode* node, UpdatePaintNodeData* data) override;
Q_SIGNALS:
void iconChanged();
@@ -71,7 +71,7 @@
void stateChanged(State state);
protected:
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
private:
QIcon m_icon;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h 2018-05-05 14:56:38.000000000 +0200
@@ -48,8 +48,8 @@
};
Q_ENUM(FillMode)
- QImageItem(QQuickItem *parent=nullptr);
- ~QImageItem();
+ explicit QImageItem(QQuickItem *parent=nullptr);
+ ~QImageItem() override;
void setImage(const QImage &image);
QImage image() const;
@@ -67,7 +67,7 @@
FillMode fillMode() const;
void setFillMode(FillMode mode);
- void paint(QPainter *painter) Q_DECL_OVERRIDE;
+ void paint(QPainter *painter) override;
bool isNull() const;
@@ -81,7 +81,7 @@
void paintedHeightChanged();
protected:
- void geometryChanged(const QRectF & newGeometry, const QRectF & oldGeometry) Q_DECL_OVERRIDE;
+ void geometryChanged(const QRectF & newGeometry, const QRectF & oldGeometry) override;
private:
QImage m_image;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h 2018-05-05 14:56:38.000000000 +0200
@@ -48,8 +48,8 @@
};
Q_ENUM(FillMode)
- QPixmapItem(QQuickItem *parent=nullptr);
- ~QPixmapItem();
+ explicit QPixmapItem(QQuickItem *parent=nullptr);
+ ~QPixmapItem() override;
void setPixmap(const QPixmap &pixmap);
QPixmap pixmap() const;
@@ -67,7 +67,7 @@
FillMode fillMode() const;
void setFillMode(FillMode mode);
- void paint(QPainter *painter) Q_DECL_OVERRIDE;
+ void paint(QPainter *painter) override;
bool isNull() const;
@@ -81,7 +81,7 @@
void paintedHeightChanged();
protected:
- void geometryChanged(const QRectF & newGeometry, const QRectF & oldGeometry) Q_DECL_OVERRIDE;
+ void geometryChanged(const QRectF & newGeometry, const QRectF & oldGeometry) override;
private:
QPixmap m_pixmap;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemplugin.h new/kdeclarative-5.46.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemplugin.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemplugin.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemplugin.h 2018-05-05 14:56:38.000000000 +0200
@@ -27,7 +27,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+ void registerTypes(const char *uri) override;
};
#endif // KWINDOWSYSTEMPLUGIN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h new/kdeclarative-5.46.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h
--- old/kdeclarative-5.45.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/qmlcontrols/kwindowsystemplugin/kwindowsystemproxy.h 2018-05-05 14:56:38.000000000 +0200
@@ -80,7 +80,7 @@
public:
explicit KWindowSystemProxy(QObject *parent = nullptr);
- virtual ~KWindowSystemProxy();
+ ~KWindowSystemProxy() override;
int currentDesktop() const;
void setCurrentDesktop(int desktop);
@@ -159,7 +159,7 @@
void compositingActiveChanged(bool compositingActive);
protected:
- void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
+ void connectNotify(const QMetaMethod &signal) override;
private:
bool m_initialized;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/quickaddons/qtquicksettings.cpp new/kdeclarative-5.46.0/src/quickaddons/qtquicksettings.cpp
--- old/kdeclarative-5.45.0/src/quickaddons/qtquicksettings.cpp 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/quickaddons/qtquicksettings.cpp 2018-05-05 14:56:38.000000000 +0200
@@ -33,11 +33,14 @@
if (!s.sceneGraphBackend().isNull()) {
QQuickWindow::setSceneGraphBackend(s.sceneGraphBackend());
}
+ auto format = QSurfaceFormat::defaultFormat();
if (s.forceGlCoreProfile()) {
- QSurfaceFormat format;
format.setVersion(3,2);
format.setProfile(QSurfaceFormat::CoreProfile);
- QSurfaceFormat::setDefaultFormat(format);
}
+ if (s.graphicsResetNotifications()) {
+ format.setOption(QSurfaceFormat::ResetNotification);
+ }
+ QSurfaceFormat::setDefaultFormat(format);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/quickaddons/quickviewsharedengine.h new/kdeclarative-5.46.0/src/quickaddons/quickviewsharedengine.h
--- old/kdeclarative-5.45.0/src/quickaddons/quickviewsharedengine.h 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/quickaddons/quickviewsharedengine.h 2018-05-05 14:56:38.000000000 +0200
@@ -59,7 +59,7 @@
Q_ENUM(ResizeMode)
explicit QuickViewSharedEngine(QWindow *parent = nullptr);
- ~QuickViewSharedEngine();
+ ~QuickViewSharedEngine() override;
/**
* Installs a translation domain for all
@@ -97,7 +97,7 @@
void setResizeMode(ResizeMode);
protected:
- void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent *e) override;
public Q_SLOTS:
void setSource(const QUrl &url);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.45.0/src/quickaddons/renderer.kcfg new/kdeclarative-5.46.0/src/quickaddons/renderer.kcfg
--- old/kdeclarative-5.45.0/src/quickaddons/renderer.kcfg 2018-04-07 21:34:05.000000000 +0200
+++ new/kdeclarative-5.46.0/src/quickaddons/renderer.kcfg 2018-05-05 14:56:38.000000000 +0200
@@ -14,5 +14,8 @@
<entry name="ForceGlCoreProfile" type="Bool">
<default>false</default>
</entry>
+ <entry name="GraphicsResetNotifications" type="Bool">
+ <default>false</default>
+ </entry>
</group>
</kcfg>