aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--tests/auto/auto.pro2
-rw-r--r--tests/auto/cursor/cursor.pro (renamed from tests/auto/scrollbar/scrollbar.pro)4
-rw-r--r--tests/auto/cursor/data/scrollbar.qml (renamed from tests/auto/scrollbar/data/cursor.qml)0
-rw-r--r--tests/auto/cursor/tst_cursor.cpp (renamed from tests/auto/scrollbar/tst_scrollbar.cpp)12
5 files changed, 10 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index b60a0dbb..3d119373 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@
/tests/auto/controls/default/tst_default
/tests/auto/controls/material/tst_material
/tests/auto/controls/universal/tst_universal
+/tests/auto/cursor/tst_cursor
/tests/auto/drawer/tst_drawer
/tests/auto/focus/tst_focus
/tests/auto/menu/tst_menu
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 6741296a..a04615d6 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -4,6 +4,7 @@ SUBDIRS += \
applicationwindow \
calendar \
controls \
+ cursor \
drawer \
menu \
platform \
@@ -17,7 +18,6 @@ SUBDIRS += \
qquickuniversalstyleconf \
revisions \
sanity \
- scrollbar \
snippets
# QTBUG-50295
diff --git a/tests/auto/scrollbar/scrollbar.pro b/tests/auto/cursor/cursor.pro
index 03e11d44..4948e943 100644
--- a/tests/auto/scrollbar/scrollbar.pro
+++ b/tests/auto/cursor/cursor.pro
@@ -1,6 +1,6 @@
CONFIG += testcase
-TARGET = tst_scrollbar
-SOURCES += tst_scrollbar.cpp
+TARGET = tst_cursor
+SOURCES += tst_cursor.cpp
macos:CONFIG -= app_bundle
diff --git a/tests/auto/scrollbar/data/cursor.qml b/tests/auto/cursor/data/scrollbar.qml
index 01dcd2ae..01dcd2ae 100644
--- a/tests/auto/scrollbar/data/cursor.qml
+++ b/tests/auto/cursor/data/scrollbar.qml
diff --git a/tests/auto/scrollbar/tst_scrollbar.cpp b/tests/auto/cursor/tst_cursor.cpp
index 741a6edc..dafb3159 100644
--- a/tests/auto/scrollbar/tst_scrollbar.cpp
+++ b/tests/auto/cursor/tst_cursor.cpp
@@ -43,20 +43,20 @@
using namespace QQuickVisualTestUtil;
-class tst_scrollbar : public QQmlDataTest
+class tst_cursor : public QQmlDataTest
{
Q_OBJECT
private slots:
- void cursorShape();
+ void scrollBar();
};
// QTBUG-59629
-void tst_scrollbar::cursorShape()
+void tst_cursor::scrollBar()
{
// Ensure that the mouse cursor has the correct shape when over a scrollbar
// which is itself over a text area with IBeamCursor.
- QQuickApplicationHelper helper(this, QStringLiteral("cursor.qml"));
+ QQuickApplicationHelper helper(this, QStringLiteral("scrollbar.qml"));
QQuickApplicationWindow *window = helper.appWindow;
window->show();
QVERIFY(QTest::qWaitForWindowExposed(window));
@@ -80,6 +80,6 @@ void tst_scrollbar::cursorShape()
QCOMPARE(scrollBar->cursor().shape(), Qt::CursorShape::ArrowCursor);
}
-QTEST_MAIN(tst_scrollbar)
+QTEST_MAIN(tst_cursor)
-#include "tst_scrollbar.moc"
+#include "tst_cursor.moc"