summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--examples/quickcontrols/controls/filesystembrowser/main.cpp6
-rw-r--r--src/controls/Private/qquickcalendarmodel_p.h6
-rw-r--r--src/controls/Private/qquickrangemodel.cpp2
-rw-r--r--src/controls/Private/qquicktreemodeladaptor.cpp2
-rw-r--r--src/controls/qquickmenupopupwindow.cpp2
-rw-r--r--src/controls/qquickpopupwindow_p.h12
-rw-r--r--src/dialogs/qquickfiledialog_p.h4
-rw-r--r--src/dialogs/qquickplatformfiledialog_p.h8
-rw-r--r--src/extras/Styles/Flat/qquicktexthandle.h2
-rw-r--r--src/extras/qquickpicture_p.h2
-rw-r--r--src/widgets/qquickqfiledialog_p.h26
-rw-r--r--tests/auto/controls/data/tst_checkbox.qml4
-rw-r--r--tests/auto/controls/data/tst_radiobutton.qml12
14 files changed, 45 insertions, 45 deletions
diff --git a/.qmake.conf b/.qmake.conf
index d6ee2340..c053efd7 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
CONFIG += warning_clean
android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop
-MODULE_VERSION = 5.10.0
+MODULE_VERSION = 5.11.0
diff --git a/examples/quickcontrols/controls/filesystembrowser/main.cpp b/examples/quickcontrols/controls/filesystembrowser/main.cpp
index 6027c828..d8599a2e 100644
--- a/examples/quickcontrols/controls/filesystembrowser/main.cpp
+++ b/examples/quickcontrols/controls/filesystembrowser/main.cpp
@@ -100,7 +100,7 @@ static inline QString sizeString(const QFileInfo &fi)
class DisplayFileSystemModel : public QFileSystemModel {
Q_OBJECT
public:
- explicit DisplayFileSystemModel(QObject *parent = Q_NULLPTR)
+ explicit DisplayFileSystemModel(QObject *parent = nullptr)
: QFileSystemModel(parent) {}
enum Roles {
@@ -111,7 +111,7 @@ public:
};
Q_ENUM(Roles)
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
{
if (index.isValid() && role >= SizeRole) {
switch (role) {
@@ -130,7 +130,7 @@ public:
return QFileSystemModel::data(index, role);
}
- QHash<int,QByteArray> roleNames() const Q_DECL_OVERRIDE
+ QHash<int,QByteArray> roleNames() const override
{
QHash<int, QByteArray> result = QFileSystemModel::roleNames();
result.insert(SizeRole, QByteArrayLiteral("size"));
diff --git a/src/controls/Private/qquickcalendarmodel_p.h b/src/controls/Private/qquickcalendarmodel_p.h
index 99ae9423..68fdea2e 100644
--- a/src/controls/Private/qquickcalendarmodel_p.h
+++ b/src/controls/Private/qquickcalendarmodel_p.h
@@ -69,11 +69,11 @@ public:
QLocale locale() const;
void setLocale(const QLocale &locale);
- QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role) const override;
- int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
- QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+ QHash<int, QByteArray> roleNames() const override;
Q_INVOKABLE QDateTime dateAt(int index) const;
Q_INVOKABLE int indexAt(const QDate &visibleDate);
diff --git a/src/controls/Private/qquickrangemodel.cpp b/src/controls/Private/qquickrangemodel.cpp
index ca393c83..cdadb2ad 100644
--- a/src/controls/Private/qquickrangemodel.cpp
+++ b/src/controls/Private/qquickrangemodel.cpp
@@ -263,7 +263,7 @@ void QQuickRangeModel1::setRange(qreal min, qreal max)
d->minimum = min;
d->maximum = qMax(min, max);
- // Update internal position if it was changed. It can occurs if internal value changes, due to range update
+ // Update internal position if it was changed. It can occur if internal value changes, due to range update
d->pos = d->equivalentPosition(d->value);
if (emitMinimumChanged)
diff --git a/src/controls/Private/qquicktreemodeladaptor.cpp b/src/controls/Private/qquicktreemodeladaptor.cpp
index 26db62a3..495abc9c 100644
--- a/src/controls/Private/qquicktreemodeladaptor.cpp
+++ b/src/controls/Private/qquicktreemodeladaptor.cpp
@@ -529,7 +529,7 @@ void QQuickTreeModelAdaptor1::modelHasBeenDestroyed()
{
// The model has been deleted. This should behave as if no model was set
clearModelData();
- emit modelChanged(Q_NULLPTR);
+ emit modelChanged(nullptr);
}
void QQuickTreeModelAdaptor1::modelHasBeenReset()
diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp
index 937a5ea5..fb231510 100644
--- a/src/controls/qquickmenupopupwindow.cpp
+++ b/src/controls/qquickmenupopupwindow.cpp
@@ -182,7 +182,7 @@ bool QQuickMenuPopupWindow1::shouldForwardEventAfterDismiss(QMouseEvent *e) cons
{
// If the event falls inside this item the event should not be forwarded.
// For example for comboboxes or top menus of the menubar
- QQuickMenuBar1 *mb = m_menu ? m_menu->menuBar() : Q_NULLPTR;
+ QQuickMenuBar1 *mb = m_menu ? m_menu->menuBar() : nullptr;
QQuickItem *item = mb && !mb->isNative() ? mb->contentItem() : menu()->visualItem();
QWindow *window = transientParent();
if (item && window && item->window() == window) {
diff --git a/src/controls/qquickpopupwindow_p.h b/src/controls/qquickpopupwindow_p.h
index 1725bbe0..35c9df26 100644
--- a/src/controls/qquickpopupwindow_p.h
+++ b/src/controls/qquickpopupwindow_p.h
@@ -71,12 +71,12 @@ Q_SIGNALS:
void geometryChanged();
protected:
- void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE;
- void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE;
- void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE;
- void exposeEvent(QExposeEvent *) Q_DECL_OVERRIDE;
- void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
- bool event(QEvent *) Q_DECL_OVERRIDE;
+ void mousePressEvent(QMouseEvent *) override;
+ void mouseReleaseEvent(QMouseEvent *) override;
+ void mouseMoveEvent(QMouseEvent *) override;
+ void exposeEvent(QExposeEvent *) override;
+ void hideEvent(QHideEvent *) override;
+ bool event(QEvent *) override;
virtual bool shouldForwardEventAfterDismiss(QMouseEvent *) const;
protected Q_SLOTS:
diff --git a/src/dialogs/qquickfiledialog_p.h b/src/dialogs/qquickfiledialog_p.h
index 5614e939..ae608d75 100644
--- a/src/dialogs/qquickfiledialog_p.h
+++ b/src/dialogs/qquickfiledialog_p.h
@@ -64,14 +64,14 @@ class QQuickFileDialog : public QQuickAbstractFileDialog
public:
explicit QQuickFileDialog(QObject *parent = 0);
~QQuickFileDialog();
- virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE;
+ QList<QUrl> fileUrls() const override;
public Q_SLOTS:
void clearSelection();
bool addSelection(const QUrl &path);
protected:
- virtual QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE { return 0; }
+ QPlatformFileDialogHelper *helper() override { return 0; }
Q_INVOKABLE QString urlToPath(const QUrl &url) { return url.toLocalFile(); }
Q_INVOKABLE QUrl pathToUrl(const QString &path) { return QUrl::fromLocalFile(path); }
Q_INVOKABLE QUrl pathFolder(const QString &path);
diff --git a/src/dialogs/qquickplatformfiledialog_p.h b/src/dialogs/qquickplatformfiledialog_p.h
index 419843f4..600e9336 100644
--- a/src/dialogs/qquickplatformfiledialog_p.h
+++ b/src/dialogs/qquickplatformfiledialog_p.h
@@ -62,12 +62,12 @@ class QQuickPlatformFileDialog : public QQuickFileDialog
public:
QQuickPlatformFileDialog(QObject *parent = 0);
virtual ~QQuickPlatformFileDialog();
- virtual void setModality(Qt::WindowModality m) Q_DECL_OVERRIDE;
- virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE;
+ void setModality(Qt::WindowModality m) override;
+ QList<QUrl> fileUrls() const override;
protected:
- QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE;
- virtual void accept() override;
+ QPlatformFileDialogHelper *helper() override;
+ void accept() override;
Q_DISABLE_COPY(QQuickPlatformFileDialog)
};
diff --git a/src/extras/Styles/Flat/qquicktexthandle.h b/src/extras/Styles/Flat/qquicktexthandle.h
index fa72786b..94df8e63 100644
--- a/src/extras/Styles/Flat/qquicktexthandle.h
+++ b/src/extras/Styles/Flat/qquicktexthandle.h
@@ -59,7 +59,7 @@ public:
QQuickTextHandle(QQuickItem *parent = 0);
~QQuickTextHandle();
- void paint(QPainter *painter) Q_DECL_OVERRIDE;
+ void paint(QPainter *painter) override;
TextHandleType type() const;
void setType(TextHandleType type);
diff --git a/src/extras/qquickpicture_p.h b/src/extras/qquickpicture_p.h
index 9c16a232..fe1227a0 100644
--- a/src/extras/qquickpicture_p.h
+++ b/src/extras/qquickpicture_p.h
@@ -55,7 +55,7 @@ public:
explicit QQuickPicture(QQuickItem *parent = 0);
~QQuickPicture();
- void paint(QPainter *painter) Q_DECL_OVERRIDE;
+ void paint(QPainter *painter) override;
QUrl source() const;
void setSource(const QUrl &source);
diff --git a/src/widgets/qquickqfiledialog_p.h b/src/widgets/qquickqfiledialog_p.h
index 9e20ae88..d977e345 100644
--- a/src/widgets/qquickqfiledialog_p.h
+++ b/src/widgets/qquickqfiledialog_p.h
@@ -66,10 +66,10 @@ public:
QQuickQFileDialog(QObject *parent = 0);
virtual ~QQuickQFileDialog();
- virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE;
+ QList<QUrl> fileUrls() const override;
protected:
- QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE;
+ QPlatformFileDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickQFileDialog)
};
@@ -80,17 +80,17 @@ class QFileDialogHelper : public QPlatformFileDialogHelper
public:
QFileDialogHelper();
- bool defaultNameFilterDisables() const Q_DECL_OVERRIDE { return true; }
- void setDirectory(const QUrl &dir) Q_DECL_OVERRIDE { m_dialog.setDirectoryUrl(dir); }
- QUrl directory() const Q_DECL_OVERRIDE { return m_dialog.directoryUrl(); }
- void selectFile(const QUrl &f) Q_DECL_OVERRIDE { m_dialog.selectUrl(f); }
- QList<QUrl> selectedFiles() const Q_DECL_OVERRIDE;
- void setFilter() Q_DECL_OVERRIDE;
- void selectNameFilter(const QString &f) Q_DECL_OVERRIDE { m_dialog.selectNameFilter(f); }
- QString selectedNameFilter() const Q_DECL_OVERRIDE { return m_dialog.selectedNameFilter(); }
- void exec() Q_DECL_OVERRIDE { m_dialog.exec(); }
- bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) Q_DECL_OVERRIDE;
- void hide() Q_DECL_OVERRIDE { m_dialog.hide(); }
+ bool defaultNameFilterDisables() const override { return true; }
+ void setDirectory(const QUrl &dir) override { m_dialog.setDirectoryUrl(dir); }
+ QUrl directory() const override { return m_dialog.directoryUrl(); }
+ void selectFile(const QUrl &f) override { m_dialog.selectUrl(f); }
+ QList<QUrl> selectedFiles() const override;
+ void setFilter() override;
+ void selectNameFilter(const QString &f) override { m_dialog.selectNameFilter(f); }
+ QString selectedNameFilter() const override { return m_dialog.selectedNameFilter(); }
+ void exec() override { m_dialog.exec(); }
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) override;
+ void hide() override { m_dialog.hide(); }
private Q_SLOTS:
void currentChanged(const QString& path);
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 675a1e7e..0c1385a2 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -239,7 +239,7 @@ Item {
signalSpy.signalName = "clicked";
compare(signalSpy.count, 0);
- mouseClick(root.checkBox2, root.checkBox2.x, root.checkBox2.y, Qt.LeftButton);
+ mouseClick(root.checkBox2);
compare(signalSpy.count, 1);
compare(root.checkBox1.checked, false);
compare(root.checkBox2.checked, true);
@@ -249,7 +249,7 @@ Item {
signalSpy.signalName = "clicked";
compare(signalSpy.count, 0);
- mouseClick(root.checkBox1, root.checkBox1.x, root.checkBox1.y, Qt.LeftButton);
+ mouseClick(root.checkBox1);
compare(signalSpy.count, 1);
compare(root.checkBox1.checked, true);
compare(root.checkBox2.checked, false);
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index a50acac6..fedc3d4d 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -112,20 +112,20 @@ Item {
signalSpy.signalName = "clicked"
signalSpy.target = radioButton;
compare(signalSpy.count, 0);
- mouseClick(radioButton, radioButton.x, radioButton.y, Qt.LeftButton);
+ mouseClick(radioButton);
compare(signalSpy.count, 1);
compare(radioButton.checked, true);
// Clicking outside should do nothing.
- mouseClick(radioButton, radioButton.x - 1, radioButton.y, Qt.LeftButton);
+ mouseClick(radioButton, -1, 0, Qt.LeftButton);
compare(signalSpy.count, 1);
compare(radioButton.checked, true);
- mouseClick(radioButton, radioButton.x, radioButton.y - 1, Qt.LeftButton);
+ mouseClick(radioButton, 0, -1, Qt.LeftButton);
compare(signalSpy.count, 1);
compare(radioButton.checked, true);
- mouseClick(radioButton, radioButton.x - 1, radioButton.y - 1, Qt.LeftButton);
+ mouseClick(radioButton, -1, -1, Qt.LeftButton);
compare(signalSpy.count, 1);
compare(radioButton.checked, true);
}
@@ -170,7 +170,7 @@ Item {
signalSpy.signalName = "clicked";
compare(signalSpy.count, 0);
- mouseClick(root.radioButton2, root.radioButton2.x, root.radioButton2.y, Qt.LeftButton);
+ mouseClick(root.radioButton2);
compare(signalSpy.count, 1);
compare(root.radioButton1.checked, false);
compare(root.radioButton2.checked, true);
@@ -180,7 +180,7 @@ Item {
signalSpy.signalName = "clicked";
compare(signalSpy.count, 0);
- mouseClick(root.radioButton1, root.radioButton1.x, root.radioButton1.y, Qt.LeftButton);
+ mouseClick(root.radioButton1);
compare(signalSpy.count, 1);
compare(root.radioButton1.checked, true);
compare(root.radioButton2.checked, false);
View Lorry Controller Status