summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--examples/quickcontrols/controls/filesystembrowser/main.cpp6
-rw-r--r--examples/quickcontrols/controls/tableview/main.qml2
-rw-r--r--examples/quickcontrols/extras/flat/Content.qml2
-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/Styles/Base/CalendarStyle.qml8
-rw-r--r--src/controls/plugin.cpp13
-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/plugin.cpp10
-rw-r--r--src/extras/plugin.h1
-rw-r--r--src/extras/qquickpicture_p.h2
-rw-r--r--src/widgets/qquickqfiledialog_p.h26
-rw-r--r--tests/auto/controls/data/tst_calendar.qml10
-rw-r--r--tests/auto/controls/data/tst_checkbox.qml4
-rw-r--r--tests/auto/controls/data/tst_combobox.qml2
-rw-r--r--tests/auto/controls/data/tst_radiobutton.qml12
22 files changed, 71 insertions, 67 deletions
diff --git a/.qmake.conf b/.qmake.conf
index b659d6516..c053efd70 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.1
+MODULE_VERSION = 5.11.0
diff --git a/examples/quickcontrols/controls/filesystembrowser/main.cpp b/examples/quickcontrols/controls/filesystembrowser/main.cpp
index 6027c828d..d8599a2ea 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/examples/quickcontrols/controls/tableview/main.qml b/examples/quickcontrols/controls/tableview/main.qml
index 006fad6db..39c1a8ce8 100644
--- a/examples/quickcontrols/controls/tableview/main.qml
+++ b/examples/quickcontrols/controls/tableview/main.qml
@@ -130,7 +130,7 @@ ApplicationWindow {
author: "Kurt Vonnegut"
}
ListElement {
- title: "Farenheit 451"
+ title: "Fahrenheit 451"
author: "Ray Bradbury"
}
ListElement {
diff --git a/examples/quickcontrols/extras/flat/Content.qml b/examples/quickcontrols/extras/flat/Content.qml
index e9b3e869f..4e5588c51 100644
--- a/examples/quickcontrols/extras/flat/Content.qml
+++ b/examples/quickcontrols/extras/flat/Content.qml
@@ -522,7 +522,7 @@ Item {
author: "Kurt Vonnegut"
}
ListElement {
- title: "Farenheit 451"
+ title: "Fahrenheit 451"
author: "Ray Bradbury"
}
ListElement {
diff --git a/src/controls/Private/qquickcalendarmodel_p.h b/src/controls/Private/qquickcalendarmodel_p.h
index 99ae94236..68fdea2ec 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 ca393c838..cdadb2ada 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 26db62a3e..495abc9c9 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/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml
index d1b172e0e..9da43ce5a 100644
--- a/src/controls/Styles/Base/CalendarStyle.qml
+++ b/src/controls/Styles/Base/CalendarStyle.qml
@@ -369,6 +369,7 @@ Style {
property int hoveredCellIndex: -1
property int pressedCellIndex: -1
property int pressCellIndex: -1
+ property var pressDate: null
Rectangle {
anchors.fill: parent
@@ -581,9 +582,11 @@ Style {
onPressed: {
pressCellIndex = cellIndexAt(mouse.x, mouse.y);
+ pressDate = null;
if (pressCellIndex !== -1) {
var date = view.model.dateAt(pressCellIndex);
pressedCellIndex = pressCellIndex;
+ pressDate = date;
if (__isValidDate(date)) {
control.selectedDate = date;
control.pressed(date);
@@ -608,9 +611,8 @@ Style {
onClicked: {
var indexOfCell = cellIndexAt(mouse.x, mouse.y);
if (indexOfCell !== -1 && indexOfCell === pressCellIndex) {
- var date = view.model.dateAt(indexOfCell);
- if (__isValidDate(date))
- control.clicked(date);
+ if (__isValidDate(pressDate))
+ control.clicked(pressDate);
}
}
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index f78098ec0..4eb6c4666 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -149,11 +149,6 @@ void QtQuickControls1Plugin::registerTypes(const char *uri)
const QString filesLocation = fileLocation();
for (int i = 0; i < int(sizeof(qmldir)/sizeof(qmldir[0])); i++)
qmlRegisterType(QUrl(filesLocation + "/" + qmldir[i].type + ".qml"), uri, qmldir[i].major, qmldir[i].minor, qmldir[i].type);
-}
-
-void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
- Q_UNUSED(uri);
// Register private API. Note that to use these types outside of the
// Qt Quick Controls module, both the public and private imports must be used.
@@ -185,6 +180,14 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur
#ifdef QT_WIDGETS_LIB
qmlRegisterType<QQuickStyleItem1>(private_uri, 1, 0, "StyleItem");
+#endif
+}
+
+void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+ Q_UNUSED(uri);
+
+#ifdef QT_WIDGETS_LIB
engine->addImageProvider("__tablerow", new QQuickTableRowImageProvider1);
#endif
engine->addImageProvider("desktoptheme", new QQuickDesktopIconProvider1);
diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp
index 937a5ea59..fb2315108 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 1725bbe03..35c9df269 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 5614e939a..ae608d752 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 419843f46..600e93365 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 fa72786b4..94df8e63c 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/plugin.cpp b/src/extras/plugin.cpp
index 5133a4ac2..68d6ca16a 100644
--- a/src/extras/plugin.cpp
+++ b/src/extras/plugin.cpp
@@ -99,22 +99,12 @@ void QtQuickExtrasPlugin::registerTypes(const char *uri)
#if QT_CONFIG(picture)
qmlRegisterType<QQuickPicture>(uri, 1, 4, "Picture");
#endif
-}
-void QtQuickExtrasPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
- Q_UNUSED(uri);
- Q_UNUSED(engine);
qmlRegisterType<QQuickMouseThief>("QtQuick.Extras.Private.CppUtils", 1, 0, "MouseThief");
qmlRegisterType<QQuickCircularProgressBar>("QtQuick.Extras.Private.CppUtils", 1, 1, "CircularProgressBar");
qmlRegisterType<QQuickFlatProgressBar>("QtQuick.Extras.Private.CppUtils", 1, 1, "FlatProgressBar");
qmlRegisterSingletonType<QQuickMathUtils>("QtQuick.Extras.Private.CppUtils", 1, 0, "MathUtils", registerMathUtilsSingleton);
-#ifndef QT_STATIC
- const QString prefix = baseUrl().toString();
-#else
- const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras";
-#endif
const char *private_uri = "QtQuick.Extras.Private";
qmlRegisterType(QUrl(prefix + "/Private/CircularButton.qml"), private_uri, 1, 0, "CircularButton");
qmlRegisterType(QUrl(prefix + "/Private/CircularButtonStyleHelper.qml"), private_uri, 1, 0, "CircularButtonStyleHelper");
diff --git a/src/extras/plugin.h b/src/extras/plugin.h
index 05855f493..5f0a380e9 100644
--- a/src/extras/plugin.h
+++ b/src/extras/plugin.h
@@ -54,7 +54,6 @@ public:
explicit QtQuickExtrasPlugin(QObject *parent = 0);
void registerTypes(const char *uri);
- void initializeEngine(QQmlEngine *engine, const char *uri);
};
QT_END_NAMESPACE
diff --git a/src/extras/qquickpicture_p.h b/src/extras/qquickpicture_p.h
index 9c16a2322..fe1227a01 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 9e20ae88f..d977e3452 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_calendar.qml b/tests/auto/controls/data/tst_calendar.qml
index 55283b021..17b2b9b41 100644
--- a/tests/auto/controls/data/tst_calendar.qml
+++ b/tests/auto/controls/data/tst_calendar.qml
@@ -414,6 +414,9 @@ Item {
compare(calendar.selectedDate.getDate(), expectedDate.getDate());
compare(calendar.__panel.pressedCellIndex, cellIndex);
compare(pressedSignalSpy.count, 1);
+ compare(pressedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear());
+ compare(pressedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth());
+ compare(pressedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate());
compare(releasedSignalSpy.count, 0);
compare(clickedSignalSpy.count, 0);
@@ -421,7 +424,14 @@ Item {
compare(calendar.__panel.pressedCellIndex, -1);
compare(pressedSignalSpy.count, 1);
compare(releasedSignalSpy.count, 1);
+ // Will fail
+// compare(releasedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear());
+// compare(releasedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth());
+// compare(releasedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate());
compare(clickedSignalSpy.count, 1);
+ compare(clickedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear());
+ compare(clickedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth());
+ compare(clickedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate());
pressedSignalSpy.clear();
releasedSignalSpy.clear();
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 675a1e7ef..0c1385a26 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_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index c380c63af..415d3ad30 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -192,7 +192,7 @@ TestCase {
}
function test_append_find() {
- var comboBox = Qt.createQmlObject( 'import QtQuick.Controls 1.2; \
+ var comboBox = Qt.createQmlObject( 'import QtQuick.Controls 1.2; \
import QtQuick 2.2; \
ComboBox { \
model:ListModel{ListElement{text:"first"}} \
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index a50acac65..fedc3d4d4 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 07:02:16 +0000