Hello community,
here is the log from the commit of package libqt5-qtquickcontrols for
openSUSE:Factory checked in at 2020-09-14 12:08:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquickcontrols"
Mon Sep 14 12:08:17 2020 rev:41 rq:833649 version:5.15.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtquickcontrols/libqt5-qtquickcontrols.changes
2020-05-29 21:15:52.578786004 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new.4249/libqt5-qtquickcontrols.changes
2020-09-14 12:09:20.755996704 +0200
@@ -1,0 +2,8 @@
+Thu Sep 10 07:57:19 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.15.1:
+ * New bugfix release
+ * For more details please see:
+
http://code.qt.io/cgit/qt/qtquickcontrols.git/plain/dist/changes-5.15.1/?h=5.15.1
+
+-------------------------------------------------------------------
Old:
----
qtquickcontrols-everywhere-src-5.15.0.tar.xz
New:
----
qtquickcontrols-everywhere-src-5.15.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquickcontrols.spec ++++++
--- /var/tmp/diff_new_pack.UVY9Tw/_old 2020-09-14 12:09:25.344001388 +0200
+++ /var/tmp/diff_new_pack.UVY9Tw/_new 2020-09-14 12:09:25.348001392 +0200
@@ -18,11 +18,11 @@
%define qt5_snapshot 0
%define base_name libqt5
-%define real_version 5.15.0
-%define so_version 5.15.0
-%define tar_version qtquickcontrols-everywhere-src-5.15.0
+%define real_version 5.15.1
+%define so_version 5.15.1
+%define tar_version qtquickcontrols-everywhere-src-5.15.1
Name: libqt5-qtquickcontrols
-Version: 5.15.0
+Version: 5.15.1
Release: 0
Summary: Qt 5 Quick Controls Addon
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qtquickcontrols-everywhere-src-5.15.0.tar.xz ->
qtquickcontrols-everywhere-src-5.15.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtquickcontrols-everywhere-src-5.15.0/.qmake.conf
new/qtquickcontrols-everywhere-src-5.15.1/.qmake.conf
--- old/qtquickcontrols-everywhere-src-5.15.0/.qmake.conf 2020-04-23
11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/.qmake.conf 2020-08-24
11:20:53.000000000 +0200
@@ -4,4 +4,4 @@
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 5.15.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtquickcontrols-everywhere-src-5.15.0/.tag
new/qtquickcontrols-everywhere-src-5.15.1/.tag
--- old/qtquickcontrols-everywhere-src-5.15.0/.tag 2020-04-23
11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/.tag 2020-08-24
11:20:53.000000000 +0200
@@ -1 +1 @@
-c9b0270985a64c9682ddf304d18a18dfb18c8944
+e22f5c4cd8ff47545e33a30f7a11d4963979ffb0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/dist/changes-5.15.1
new/qtquickcontrols-everywhere-src-5.15.1/dist/changes-5.15.1
--- old/qtquickcontrols-everywhere-src-5.15.0/dist/changes-5.15.1
1970-01-01 01:00:00.000000000 +0100
+++ new/qtquickcontrols-everywhere-src-5.15.1/dist/changes-5.15.1
2020-08-24 11:20:53.000000000 +0200
@@ -0,0 +1,34 @@
+Qt 5.15.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.15.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ https://doc.qt.io/qt-5.15/index.html
+
+The Qt version 5.15 series is binary compatible with the 5.14.x series.
+Applications compiled for 5.14 will continue to run with 5.15.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Controls *
+****************************************************************************
+
+ - [QTBUG-84853] Fixed a crash in TreeView when using a QFileSystemModel
+ wrapped with a QSortFilterProxyModel.
+
+****************************************************************************
+* Dialogs *
+****************************************************************************
+
+ - [QTBUG-85434] Fixed a regression that caused ColorDialog to hang,
+ at least on Android.
+ - [QTBUG-84086] The metadata in the icon font icons.ttf now gives
+ permission to install the font.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickrangemodel_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickrangemodel_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickrangemodel_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickrangemodel_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -92,8 +92,8 @@
Q_INVOKABLE qreal valueForPosition(qreal position) const;
Q_INVOKABLE qreal positionForValue(qreal value) const;
- void classBegin();
- void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
public Q_SLOTS:
void toMinimum();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickspinboxvalidator_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickspinboxvalidator_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickspinboxvalidator_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickspinboxvalidator_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -87,11 +87,11 @@
QString suffix() const;
void setSuffix(const QString &suffix);
- void fixup(QString &input) const;
- State validate(QString &input, int &pos) const;
+ void fixup(QString &input) const override;
+ State validate(QString &input, int &pos) const override;
- void classBegin() { }
- void componentComplete();
+ void classBegin() override { }
+ void componentComplete() override;
public Q_SLOTS:
void increment();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickstyleitem_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickstyleitem_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickstyleitem_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickstyleitem_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -55,7 +55,7 @@
public:
QQuickTableRowImageProvider1()
: QQuickImageProvider(QQuickImageProvider::Pixmap) {}
- QPixmap requestPixmap(const QString &id, QSize *size, const QSize
&requestedSize);
+ QPixmap requestPixmap(const QString &id, QSize *size, const QSize
&requestedSize) override;
};
class QQuickStyleItem1: public QQuickItem
@@ -245,9 +245,10 @@
void textureHeightChanged(int h);
protected:
- virtual bool event(QEvent *);
- virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
- virtual void updatePolish();
+ bool event(QEvent *)
+ override;
+ QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
+ void updatePolish() override;
private:
QSize sizeFromContents(int width, int height);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquicktreemodeladaptor.cpp
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquicktreemodeladaptor.cpp
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquicktreemodeladaptor.cpp
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquicktreemodeladaptor.cpp
2020-08-24 11:20:53.000000000 +0200
@@ -266,7 +266,7 @@
return m_items.at(index.row()).index;
}
-QModelIndex QQuickTreeModelAdaptor1::mapRowToModelIndex(int row) const
+QPersistentModelIndex QQuickTreeModelAdaptor1::mapRowToModelIndex(int row)
const
{
if (!m_model)
return QModelIndex();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquicktreemodeladaptor_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquicktreemodeladaptor_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquicktreemodeladaptor_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquicktreemodeladaptor_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -84,10 +84,10 @@
ModelIndexRole
};
- QHash<int, QByteArray> roleNames() const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &, int role) const;
- bool setData(const QModelIndex &index, const QVariant &value, int role);
+ QHash<int, QByteArray> roleNames() const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &, int role) const override;
+ bool setData(const QModelIndex &index, const QVariant &value, int role)
override;
void clearModelData();
@@ -95,7 +95,7 @@
bool childrenVisible(const QModelIndex &index);
const QModelIndex &mapToModel(const QModelIndex &index) const;
- Q_INVOKABLE QModelIndex mapRowToModelIndex(int row) const;
+ Q_INVOKABLE QPersistentModelIndex mapRowToModelIndex(int row) const;
Q_INVOKABLE QItemSelection selectionForRowRange(const QModelIndex
&fromIndex, const QModelIndex &toIndex) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickwheelarea_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickwheelarea_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/Private/qquickwheelarea_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/Private/qquickwheelarea_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -96,7 +96,7 @@
bool isInverted() const;
#ifndef QT_NO_WHEELEVENT
- void wheelEvent(QWheelEvent *event);
+ void wheelEvent(QWheelEvent *event) override;
#endif
bool isAtXEnd() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/TextArea.qml
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/TextArea.qml
--- old/qtquickcontrols-everywhere-src-5.15.0/src/controls/TextArea.qml
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/controls/TextArea.qml
2020-08-24 11:20:53.000000000 +0200
@@ -365,8 +365,8 @@
Set this property to wrap the text to the TextArea item's width.
\list
- \li TextEdit.NoWrap - no wrapping will be performed.
- \li TextEdit.WordWrap (default) - wrapping is done on word boundaries
only.
+ \li TextEdit.NoWrap (default) - no wrapping will be performed.
+ \li TextEdit.WordWrap - wrapping is done on word boundaries only.
\li TextEdit.WrapAnywhere - wrapping is done at any point on a line,
even if it occurs in the middle of a word.
\li TextEdit.Wrap - if possible, wrapping occurs at a word boundary;
otherwise it will occur at the appropriate point on the line, even in the
middle of a word.
\endlist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/plugin.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/plugin.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/controls/plugin.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/controls/plugin.h
2020-08-24 11:20:53.000000000 +0200
@@ -56,8 +56,8 @@
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
QtQuickControls1Plugin(QObject *parent = 0);
- void registerTypes(const char *uri);
- void initializeEngine(QQmlEngine *engine, const char *uri);
+ void registerTypes(const char *uri) override;
+ void initializeEngine(QQmlEngine *engine, const char *uri) override;
private:
QString fileLocation() const;
bool isLoadedFromResource() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickaction_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickaction_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickaction_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickaction_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -109,7 +109,7 @@
QVariant iconVariant() const { return QVariant(m_icon); }
void setIcon(const QIcon &icon) { m_icon = icon; emit iconChanged(); }
- bool event(QEvent *e);
+ bool event(QEvent *e) override;
public Q_SLOTS:
void trigger(QObject *source = 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickdesktopiconprovider_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickdesktopiconprovider_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickdesktopiconprovider_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickdesktopiconprovider_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -54,7 +54,7 @@
{
}
- QPixmap requestPixmap(const QString &id, QSize *size, const QSize
&requestedSize)
+ QPixmap requestPixmap(const QString &id, QSize *size, const QSize
&requestedSize) override
{
Q_UNUSED(requestedSize);
Q_UNUSED(size);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenu_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenu_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenu_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenu_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -117,8 +117,8 @@
QQuickMenu1(QObject *parent = 0);
virtual ~QQuickMenu1();
- void setVisible(bool);
- void setEnabled(bool);
+ void setVisible(bool) override;
+ void setEnabled(bool) override;
int selectedIndex() const { return m_selectedIndex; }
void setSelectedIndex(int index);
@@ -144,7 +144,7 @@
QQuickItem *menuContentItem() const { return m_menuContentItem; }
bool popupVisible() const { return m_popupVisible; }
- bool isNative() { return m_platformMenu != 0; }
+ bool isNative() override { return m_platformMenu != 0; }
QRect popupGeometry() const;
@@ -166,7 +166,7 @@
void hideMenu();
void clearPopupWindow();
- void updateText();
+ void updateText() override;
void windowVisibleChanged(bool);
void platformMenuWindowVisibleChanged(bool);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenuitem_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenuitem_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenuitem_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenuitem_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -197,12 +197,12 @@
QQuickMenuItem1(QObject *parent = 0);
~QQuickMenuItem1();
- void setEnabled(bool enabled);
+ void setEnabled(bool enabled) override;
- QString text() const;
+ QString text() const override;
- QUrl iconSource() const;
- QString iconName() const;
+ QUrl iconSource() const override;
+ QString iconName() const override;
QQuickAction1 *boundAction() { return m_boundAction; }
void setBoundAction(QQuickAction1 *a);
@@ -219,7 +219,7 @@
QQuickExclusiveGroup1 *exclusiveGroup() const;
void setExclusiveGroup(QQuickExclusiveGroup1 *);
- void setParentMenu(QQuickMenu1 *parentMenu);
+ void setParentMenu(QQuickMenu1 *parentMenu) override;
protected Q_SLOTS:
void updateShortcut();
@@ -229,8 +229,8 @@
void unbindFromAction(QObject *action);
protected:
- QIcon icon() const;
- QQuickAction1 *action() const;
+ QIcon icon() const override;
+ QQuickAction1 *action() const override;
private:
QQuickAction1 *m_boundAction;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenuitemcontainer_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenuitemcontainer_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenuitemcontainer_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenuitemcontainer_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -59,7 +59,7 @@
setParentMenu(0);
}
- void setParentMenu(QQuickMenu1 *parentMenu)
+ void setParentMenu(QQuickMenu1 *parentMenu) override
{
QQuickMenuBase1::setParentMenu(parentMenu);
for (QQuickMenuBase1 *item : qAsConst(m_menuItems))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenupopupwindow_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenupopupwindow_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/controls/qquickmenupopupwindow_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/controls/qquickmenupopupwindow_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -57,7 +57,7 @@
void setParentWindow(QWindow *effectiveParentWindow, QQuickWindow
*parentWindow);
void setGeometry(int posx, int posy, int w, int h);
- void setParentItem(QQuickItem *);
+ void setParentItem(QQuickItem *) override;
QQuickMenu1 *menu() const;
public Q_SLOTS:
@@ -71,9 +71,9 @@
void willBeDeletedLater();
protected:
- void focusInEvent(QFocusEvent *);
- void exposeEvent(QExposeEvent *);
- bool shouldForwardEventAfterDismiss(QMouseEvent *) const;
+ void focusInEvent(QFocusEvent *) override;
+ void exposeEvent(QExposeEvent *) override;
+ bool shouldForwardEventAfterDismiss(QMouseEvent *) const override;
private:
QQuickItem *m_itemAt;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/Private/dialogsprivateplugin.cpp
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/Private/dialogsprivateplugin.cpp
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/Private/dialogsprivateplugin.cpp
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/Private/dialogsprivateplugin.cpp
2020-08-24 11:20:53.000000000 +0200
@@ -51,7 +51,7 @@
public:
QtQuick2DialogsPrivatePlugin(QObject *parent = 0) :
QQmlExtensionPlugin(parent) { }
- virtual void registerTypes(const char *uri)
+ void registerTypes(const char *uri) override
{
Q_ASSERT(QLatin1String(uri) ==
QLatin1String("QtQuick.Dialogs.Private"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/Private/qquickfontlistmodel_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/Private/qquickfontlistmodel_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/Private/qquickfontlistmodel_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/Private/qquickfontlistmodel_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -73,10 +73,10 @@
FontFamilyRole = Qt::UserRole + 1
};
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QModelIndex index(int row, int column, const QModelIndex &parent =
QModelIndex()) const;
- virtual QVariant data(const QModelIndex &index, int role =
Qt::DisplayRole) const;
- virtual QHash<int, QByteArray> roleNames() const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex index(int row, int column, const QModelIndex &parent =
QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
override;
+ QHash<int, QByteArray> roleNames() const override;
int count() const { return rowCount(QModelIndex()); }
@@ -91,8 +91,8 @@
Q_INVOKABLE QJSValue get(int index) const;
Q_INVOKABLE QJSValue pointSizes();
- virtual void classBegin();
- virtual void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
public Q_SLOTS:
void setScalableFonts(bool arg);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/Private/qquickwritingsystemlistmodel_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/Private/qquickwritingsystemlistmodel_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/Private/qquickwritingsystemlistmodel_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/Private/qquickwritingsystemlistmodel_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -68,10 +68,10 @@
WritingSystemSampleRole = Qt::UserRole + 2
};
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QModelIndex index(int row, int column, const QModelIndex &parent =
QModelIndex()) const;
- virtual QVariant data(const QModelIndex &index, int role =
Qt::DisplayRole) const;
- virtual QHash<int, QByteArray> roleNames() const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex index(int row, int column, const QModelIndex &parent =
QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
override;
+ QHash<int, QByteArray> roleNames() const override;
int count() const { return rowCount(QModelIndex()); }
@@ -79,8 +79,8 @@
Q_INVOKABLE QJSValue get(int index) const;
- virtual void classBegin();
- virtual void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
Q_SIGNALS:
void writingSystemsChanged();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/plugin.cpp
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/plugin.cpp
--- old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/plugin.cpp
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/plugin.cpp
2020-08-24 11:20:53.000000000 +0200
@@ -88,7 +88,7 @@
public:
QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { }
- virtual void registerTypes(const char *uri) {
+ void registerTypes(const char *uri) override {
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs"));
bool hasTopLevelWindows =
QGuiApplicationPrivate::platformIntegration()->
hasCapability(QPlatformIntegration::MultipleWindows);
@@ -110,7 +110,7 @@
#endif
#endif
- QQuickAbstractDialog::m_decorationComponentUrl =
fileLocation("DefaultWindowDecoration");
+ QQuickAbstractDialog::m_decorationComponentUrl =
fileLocation("qml/DefaultWindowDecoration");
// Prefer the QPA dialog helpers if the platform supports them.
// Else if there is a QWidget-based implementation, check whether it's
// possible to instantiate it from Qt Quick.
Binary files
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qml/icons.ttf and
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qml/icons.ttf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractcolordialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractcolordialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractcolordialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractcolordialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -73,7 +73,7 @@
QQuickAbstractColorDialog(QObject *parent = 0);
virtual ~QQuickAbstractColorDialog();
- virtual QString title() const;
+ QString title() const override;
bool showAlphaChannel() const;
QColor color() const { return m_color; }
QColor currentColor() const { return m_currentColor; }
@@ -83,9 +83,9 @@
qreal currentAlpha() const { return m_currentColor.alphaF(); }
public Q_SLOTS:
- void setVisible(bool v);
- void setModality(Qt::WindowModality m);
- void setTitle(const QString &t);
+ void setVisible(bool v) override;
+ void setModality(Qt::WindowModality m) override;
+ void setTitle(const QString &t) override;
void setColor(QColor arg);
void setCurrentColor(QColor currentColor);
void setShowAlphaChannel(bool arg);
@@ -97,7 +97,7 @@
void selectionAccepted();
protected Q_SLOTS:
- virtual void accept();
+ void accept() override;
protected:
QPlatformColorDialogHelper *m_dlgHelper;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractfiledialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractfiledialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractfiledialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractfiledialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -82,7 +82,7 @@
QQuickAbstractFileDialog(QObject *parent = 0);
virtual ~QQuickAbstractFileDialog();
- virtual QString title() const;
+ QString title() const override;
bool selectExisting() const { return m_selectExisting; }
bool selectMultiple() const { return m_selectMultiple; }
bool selectFolder() const { return m_selectFolder; }
@@ -99,8 +99,8 @@
QString defaultSuffix() const { return m_options->defaultSuffix(); }
public Q_SLOTS:
- void setVisible(bool v);
- void setTitle(const QString &t);
+ void setVisible(bool v) override;
+ void setTitle(const QString &t) override;
void setSelectExisting(bool s);
void setSelectMultiple(bool s);
void setSelectFolder(bool s);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractfontdialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractfontdialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractfontdialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractfontdialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -73,7 +73,7 @@
QQuickAbstractFontDialog(QObject *parent = 0);
virtual ~QQuickAbstractFontDialog();
- virtual QString title() const;
+ QString title() const override;
bool scalableFonts() const;
bool nonScalableFonts() const;
bool monospacedFonts() const;
@@ -82,9 +82,9 @@
QFont currentFont() const { return m_currentFont; }
public Q_SLOTS:
- void setVisible(bool v);
- void setModality(Qt::WindowModality m);
- void setTitle(const QString &t);
+ void setVisible(bool v) override;
+ void setModality(Qt::WindowModality m) override;
+ void setTitle(const QString &t) override;
void setFont(const QFont &arg);
void setCurrentFont(const QFont &arg);
void setScalableFonts(bool arg);
@@ -102,7 +102,7 @@
void selectionAccepted();
protected Q_SLOTS:
- virtual void accept();
+ void accept() override;
protected:
QPlatformFontDialogHelper *m_dlgHelper;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractmessagedialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractmessagedialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickabstractmessagedialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickabstractmessagedialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -76,7 +76,7 @@
QQuickAbstractMessageDialog(QObject *parent = 0);
virtual ~QQuickAbstractMessageDialog();
- virtual QString title() const { return m_options->windowTitle(); }
+ QString title() const override { return m_options->windowTitle(); }
QString text() const { return m_options->text(); }
QString informativeText() const { return m_options->informativeText(); }
QString detailedText() const { return m_options->detailedText(); }
@@ -98,8 +98,8 @@
StandardButton clickedButton() const { return m_clickedButton; }
public Q_SLOTS:
- virtual void setVisible(bool v);
- virtual void setTitle(const QString &arg);
+ void setVisible(bool v) override;
+ void setTitle(const QString &arg) override;
void setText(const QString &arg);
void setInformativeText(const QString &arg);
void setDetailedText(const QString &arg);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickcolordialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickcolordialog_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickcolordialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickcolordialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -66,7 +66,7 @@
~QQuickColorDialog();
protected:
- virtual QPlatformColorDialogHelper *helper() { return 0; }
+ QPlatformColorDialogHelper *helper() override { return 0; }
Q_DISABLE_COPY(QQuickColorDialog)
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickdialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickdialog_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickdialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickdialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -78,11 +78,11 @@
Q_INVOKABLE QJSValue __standardButtonsLeftModel();
Q_INVOKABLE QJSValue __standardButtonsRightModel();
- QString title() const { return m_title; }
- virtual void setVisible(bool v);
+ QString title() const override { return m_title; }
+ void setVisible(bool v) override;
public Q_SLOTS:
- virtual void setTitle(const QString &arg);
+ void setTitle(const QString &arg) override;
void setStandardButtons(StandardButtons buttons);
void click(QQuickAbstractDialog::StandardButton button);
@@ -98,12 +98,12 @@
void reset();
protected:
- virtual QPlatformDialogHelper *helper() { return 0; }
+ QPlatformDialogHelper *helper() override { return 0; }
void click(QPlatformDialogHelper::StandardButton button,
QPlatformDialogHelper::ButtonRole);
protected Q_SLOTS:
- virtual void accept();
- virtual void reject();
+ void accept() override;
+ void reject() override;
private:
void updateStandardButtons();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickfontdialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickfontdialog_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickfontdialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickfontdialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -66,7 +66,7 @@
~QQuickFontDialog();
protected:
- virtual QPlatformFontDialogHelper *helper() { return 0; }
+ QPlatformFontDialogHelper *helper() override { return 0; }
Q_DISABLE_COPY(QQuickFontDialog)
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickmessagedialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickmessagedialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickmessagedialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickmessagedialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -66,11 +66,11 @@
~QQuickMessageDialog();
protected:
- virtual QPlatformDialogHelper *helper() { return 0; }
+ QPlatformDialogHelper *helper() override { return 0; }
protected Q_SLOTS:
- virtual void accept();
- virtual void reject();
+ void accept() override;
+ void reject() override;
private:
Q_DISABLE_COPY(QQuickMessageDialog)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickplatformcolordialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickplatformcolordialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickplatformcolordialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickplatformcolordialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -64,7 +64,7 @@
virtual ~QQuickPlatformColorDialog1();
protected:
- QPlatformColorDialogHelper *helper();
+ QPlatformColorDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickPlatformColorDialog1)
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickplatformfontdialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickplatformfontdialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickplatformfontdialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickplatformfontdialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -64,7 +64,7 @@
virtual ~QQuickPlatformFontDialog1();
protected:
- QPlatformFontDialogHelper *helper();
+ QPlatformFontDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickPlatformFontDialog1)
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickplatformmessagedialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickplatformmessagedialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/dialogs/qquickplatformmessagedialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/dialogs/qquickplatformmessagedialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -64,7 +64,7 @@
virtual ~QQuickPlatformMessageDialog1();
protected:
- QPlatformMessageDialogHelper *helper();
+ QPlatformMessageDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickPlatformMessageDialog1)
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Private/qquickcircularprogressbar_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Private/qquickcircularprogressbar_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Private/qquickcircularprogressbar_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Private/qquickcircularprogressbar_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -59,7 +59,7 @@
QQuickCircularProgressBar(QQuickItem *parent = 0);
~QQuickCircularProgressBar();
- void paint(QPainter *painter);
+ void paint(QPainter *painter) override;
qreal progress() const;
void setProgress(qreal progress);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Private/qquickflatprogressbar_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Private/qquickflatprogressbar_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Private/qquickflatprogressbar_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Private/qquickflatprogressbar_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -53,7 +53,7 @@
public:
explicit QQuickFlatProgressBar(QQuickItem *parent = 0);
- void paint(QPainter *painter);
+ void paint(QPainter *painter) override;
qreal stripeOffset() const;
void setStripeOffset(qreal stripeOffset);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Private/qquickmousethief_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Private/qquickmousethief_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Private/qquickmousethief_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Private/qquickmousethief_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -74,7 +74,7 @@
void handledEventChanged();
protected:
- bool eventFilter(QObject *obj, QEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event) override;
private slots:
void itemWindowChanged(QQuickWindow *window);
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Styles/Flat/flatstyleplugin.h
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Styles/Flat/flatstyleplugin.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/Styles/Flat/flatstyleplugin.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/Styles/Flat/flatstyleplugin.h
2020-08-24 11:20:53.000000000 +0200
@@ -53,7 +53,7 @@
public:
explicit QtQuickExtrasStylesPlugin(QObject *parent = 0);
- void registerTypes(const char *uri);
+ void registerTypes(const char *uri) override;
};
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/extras/plugin.h
new/qtquickcontrols-everywhere-src-5.15.1/src/extras/plugin.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/extras/plugin.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/extras/plugin.h
2020-08-24 11:20:53.000000000 +0200
@@ -53,7 +53,7 @@
public:
explicit QtQuickExtrasPlugin(QObject *parent = 0);
- void registerTypes(const char *uri);
+ void registerTypes(const char *uri) override;
};
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qmessageboxhelper_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qmessageboxhelper_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qmessageboxhelper_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qmessageboxhelper_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -61,12 +61,12 @@
public:
QCloseableMessageBox(QWidget *parent = 0) : QMessageBox(parent) { }
- void closeEvent(QCloseEvent *e) {
+ void closeEvent(QCloseEvent *e) override {
// QTBUG-36227: Bypass QMessageBox::closeEvent()
QDialog::closeEvent(e);
}
- void keyPressEvent(QKeyEvent *e) {
+ void keyPressEvent(QKeyEvent *e) override {
QMessageBox::keyPressEvent(e);
// QTBUG-36227: reject on escape or cmd-period even if there's no
cancel button
if ((isVisible() && e->key() == Qt::Key_Escape)
@@ -88,9 +88,9 @@
connect(&m_dialog, SIGNAL(buttonClicked(QAbstractButton*)), this,
SLOT(buttonClicked(QAbstractButton*)));
}
- virtual void exec() { m_dialog.exec(); }
+ void exec() override { m_dialog.exec(); }
- virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow
*parent) {
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent)
override {
m_dialog.winId();
QWindow *window = m_dialog.windowHandle();
Q_ASSERT(window);
@@ -113,7 +113,7 @@
return m_dialog.isVisible();
}
- virtual void hide() { m_dialog.hide(); }
+ void hide() override { m_dialog.hide(); }
QCloseableMessageBox m_dialog;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqcolordialog.cpp
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqcolordialog.cpp
---
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqcolordialog.cpp
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqcolordialog.cpp
2020-08-24 11:20:53.000000000 +0200
@@ -60,12 +60,12 @@
connect(&m_dialog, SIGNAL(rejected()), this, SIGNAL(reject()));
}
- virtual void setCurrentColor(const QColor &c) {
m_dialog.setCurrentColor(c); }
- virtual QColor currentColor() const { return m_dialog.currentColor(); }
+ void setCurrentColor(const QColor &c) override {
m_dialog.setCurrentColor(c); }
+ QColor currentColor() const override { return m_dialog.currentColor(); }
- virtual void exec() { m_dialog.exec(); }
+ void exec() override { m_dialog.exec(); }
- virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow
*parent) {
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent)
override {
m_dialog.winId();
QWindow *window = m_dialog.windowHandle();
Q_ASSERT(window);
@@ -78,7 +78,7 @@
return m_dialog.isVisible();
}
- virtual void hide() { m_dialog.hide(); }
+ void hide() override { m_dialog.hide(); }
private:
QColorDialog m_dialog;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqcolordialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqcolordialog_p.h
---
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqcolordialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqcolordialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -64,7 +64,7 @@
virtual ~QQuickQColorDialog();
protected:
- QPlatformColorDialogHelper *helper();
+ QPlatformColorDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickQColorDialog)
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqfontdialog.cpp
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqfontdialog.cpp
--- old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqfontdialog.cpp
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqfontdialog.cpp
2020-08-24 11:20:53.000000000 +0200
@@ -60,12 +60,12 @@
connect(&m_dialog, SIGNAL(rejected()), this, SIGNAL(reject()));
}
- virtual void setCurrentFont(const QFont &font) {
m_dialog.setCurrentFont(font); }
- virtual QFont currentFont() const { return m_dialog.currentFont(); }
+ void setCurrentFont(const QFont &font) override {
m_dialog.setCurrentFont(font); }
+ QFont currentFont() const override { return m_dialog.currentFont(); }
- virtual void exec() { m_dialog.exec(); }
+ void exec() override { m_dialog.exec(); }
- virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow
*parent) {
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent)
override {
m_dialog.winId();
QWindow *window = m_dialog.windowHandle();
Q_ASSERT(window);
@@ -80,7 +80,7 @@
return m_dialog.isVisible();
}
- virtual void hide() { m_dialog.hide(); }
+ void hide() override { m_dialog.hide(); }
private:
QFontDialog m_dialog;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqfontdialog_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqfontdialog_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqfontdialog_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqfontdialog_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -64,7 +64,7 @@
virtual ~QQuickQFontDialog();
protected:
- QPlatformFontDialogHelper *helper();
+ QPlatformFontDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickQFontDialog)
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqmessagebox_p.h
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqmessagebox_p.h
--- old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/qquickqmessagebox_p.h
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/qquickqmessagebox_p.h
2020-08-24 11:20:53.000000000 +0200
@@ -62,7 +62,7 @@
virtual ~QQuickQMessageBox();
protected:
- virtual QPlatformDialogHelper *helper();
+ QPlatformDialogHelper *helper() override;
protected:
Q_DISABLE_COPY(QQuickQMessageBox)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/widgetsplugin.cpp
new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/widgetsplugin.cpp
--- old/qtquickcontrols-everywhere-src-5.15.0/src/widgets/widgetsplugin.cpp
2020-04-23 11:28:15.000000000 +0200
+++ new/qtquickcontrols-everywhere-src-5.15.1/src/widgets/widgetsplugin.cpp
2020-08-24 11:20:53.000000000 +0200
@@ -81,7 +81,7 @@
public:
QtQuick2PrivateWidgetsPlugin(QObject *parent = 0) :
QQmlExtensionPlugin(parent) { }
- virtual void registerTypes(const char *uri)
+ void registerTypes(const char *uri) override
{
Q_ASSERT(QLatin1String(uri) ==
QLatin1String("QtQuick.PrivateWidgets"));
#if QT_CONFIG(messagebox)
