aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro4
-rw-r--r--tests/auto/qquickapplicationwindow/data/activeFocusControl.qml (renamed from tests/auto/applicationwindow/data/activeFocusControl.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/activefocusontab.qml (renamed from tests/auto/applicationwindow/data/activefocusontab.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/attachedProperties.qml (renamed from tests/auto/applicationwindow/data/attachedProperties.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml (renamed from tests/auto/applicationwindow/data/basicapplicationwindow.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml (renamed from tests/auto/applicationwindow/data/clearfocusondestruction.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/defaultFocus.qml (renamed from tests/auto/applicationwindow/data/defaultFocus.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/fill.qml (renamed from tests/auto/applicationwindow/data/fill.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml (renamed from tests/auto/applicationwindow/data/focusAfterPopupClosed.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/font.qml (renamed from tests/auto/applicationwindow/data/font.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/layout.qml (renamed from tests/auto/applicationwindow/data/layout.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/data/locale.qml (renamed from tests/auto/applicationwindow/data/locale.qml)0
-rw-r--r--tests/auto/qquickapplicationwindow/qquickapplicationwindow.pro (renamed from tests/auto/applicationwindow/applicationwindow.pro)4
-rw-r--r--tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp (renamed from tests/auto/applicationwindow/tst_applicationwindow.cpp)38
14 files changed, 23 insertions, 23 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 3acc4704..2eb23fd0 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,7 +1,6 @@
TEMPLATE = subdirs
SUBDIRS += \
accessibility \
- applicationwindow \
calendar \
controls \
cursor \
@@ -10,6 +9,7 @@ SUBDIRS += \
menu \
platform \
pressandhold \
+ qquickapplicationwindow \
qquickdrawer \
qquickmaterialstyle \
qquickmaterialstyleconf \
@@ -23,7 +23,7 @@ SUBDIRS += \
snippets
# QTBUG-60268
-boot2qt: SUBDIRS -= applicationwindow calendar controls cursor \
+boot2qt: SUBDIRS -= qquickapplicationwindow calendar controls cursor \
qquickdrawer focus font menu platform qquickpopup qquickmaterialstyle \
qquickmaterialstyleconf qquickuniversalstyle \
qquickuniversalstyleconf snippets
diff --git a/tests/auto/applicationwindow/data/activeFocusControl.qml b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
index 940e8e08..940e8e08 100644
--- a/tests/auto/applicationwindow/data/activeFocusControl.qml
+++ b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
index 357ea9a4..357ea9a4 100644
--- a/tests/auto/applicationwindow/data/activefocusontab.qml
+++ b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
diff --git a/tests/auto/applicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
index 09bc47ef..09bc47ef 100644
--- a/tests/auto/applicationwindow/data/attachedProperties.qml
+++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
index 16182f59..16182f59 100644
--- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
diff --git a/tests/auto/applicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
index 3589439e..3589439e 100644
--- a/tests/auto/applicationwindow/data/clearfocusondestruction.qml
+++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
diff --git a/tests/auto/applicationwindow/data/defaultFocus.qml b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
index 741ce908..741ce908 100644
--- a/tests/auto/applicationwindow/data/defaultFocus.qml
+++ b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
diff --git a/tests/auto/applicationwindow/data/fill.qml b/tests/auto/qquickapplicationwindow/data/fill.qml
index 27b10d34..27b10d34 100644
--- a/tests/auto/applicationwindow/data/fill.qml
+++ b/tests/auto/qquickapplicationwindow/data/fill.qml
diff --git a/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
index f0499a3a..f0499a3a 100644
--- a/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml
+++ b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
diff --git a/tests/auto/applicationwindow/data/font.qml b/tests/auto/qquickapplicationwindow/data/font.qml
index a675aeab..a675aeab 100644
--- a/tests/auto/applicationwindow/data/font.qml
+++ b/tests/auto/qquickapplicationwindow/data/font.qml
diff --git a/tests/auto/applicationwindow/data/layout.qml b/tests/auto/qquickapplicationwindow/data/layout.qml
index a80b2d48..a80b2d48 100644
--- a/tests/auto/applicationwindow/data/layout.qml
+++ b/tests/auto/qquickapplicationwindow/data/layout.qml
diff --git a/tests/auto/applicationwindow/data/locale.qml b/tests/auto/qquickapplicationwindow/data/locale.qml
index 92edb53a..92edb53a 100644
--- a/tests/auto/applicationwindow/data/locale.qml
+++ b/tests/auto/qquickapplicationwindow/data/locale.qml
diff --git a/tests/auto/applicationwindow/applicationwindow.pro b/tests/auto/qquickapplicationwindow/qquickapplicationwindow.pro
index f94641c7..775f4c90 100644
--- a/tests/auto/applicationwindow/applicationwindow.pro
+++ b/tests/auto/qquickapplicationwindow/qquickapplicationwindow.pro
@@ -1,6 +1,6 @@
CONFIG += testcase
-TARGET = tst_applicationwindow
-SOURCES += tst_applicationwindow.cpp
+TARGET = tst_qquickapplicationwindow
+SOURCES += tst_qquickapplicationwindow.cpp
macos:CONFIG -= app_bundle
diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index f35d9b7d..19a0bf3b 100644
--- a/tests/auto/applicationwindow/tst_applicationwindow.cpp
+++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
@@ -56,7 +56,7 @@
using namespace QQuickVisualTestUtil;
-class tst_applicationwindow : public QQmlDataTest
+class tst_QQuickApplicationWindow : public QQmlDataTest
{
Q_OBJECT
public:
@@ -79,7 +79,7 @@ private slots:
void componentComplete();
};
-void tst_applicationwindow::qmlCreation()
+void tst_QQuickApplicationWindow::qmlCreation()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -104,7 +104,7 @@ void tst_applicationwindow::qmlCreation()
QVERIFY(!footer);
}
-void tst_applicationwindow::activeFocusOnTab1()
+void tst_QQuickApplicationWindow::activeFocusOnTab1()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -156,7 +156,7 @@ void tst_applicationwindow::activeFocusOnTab1()
QVERIFY(item->hasActiveFocus());
}
-void tst_applicationwindow::activeFocusOnTab2()
+void tst_QQuickApplicationWindow::activeFocusOnTab2()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -208,7 +208,7 @@ void tst_applicationwindow::activeFocusOnTab2()
QVERIFY(item->hasActiveFocus());
}
-void tst_applicationwindow::defaultFocus()
+void tst_QQuickApplicationWindow::defaultFocus()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -236,7 +236,7 @@ void tst_applicationwindow::defaultFocus()
QVERIFY(item->hasActiveFocus());
}
-void tst_applicationwindow::implicitFill()
+void tst_QQuickApplicationWindow::implicitFill()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -267,7 +267,7 @@ void tst_applicationwindow::implicitFill()
QCOMPARE(nextItem->height(), 400.0);
}
-void tst_applicationwindow::attachedProperties()
+void tst_QQuickApplicationWindow::attachedProperties()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -450,7 +450,7 @@ void tst_applicationwindow::attachedProperties()
qApp->processEvents();
}
-void tst_applicationwindow::font()
+void tst_QQuickApplicationWindow::font()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -521,7 +521,7 @@ public:
QFont m_font;
};
-void tst_applicationwindow::defaultFont()
+void tst_QQuickApplicationWindow::defaultFont()
{
TestTheme theme(QGuiApplicationPrivate::platform_theme);
@@ -535,7 +535,7 @@ void tst_applicationwindow::defaultFont()
QCOMPARE(window->font(), *theme.font());
}
-void tst_applicationwindow::locale()
+void tst_QQuickApplicationWindow::locale()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -586,7 +586,7 @@ void tst_applicationwindow::locale()
QCOMPARE(item3->locale(), l);
}
-void tst_applicationwindow::activeFocusControl_data()
+void tst_QQuickApplicationWindow::activeFocusControl_data()
{
QTest::addColumn<QByteArray>("containerName");
QTest::addColumn<QByteArray>("activeFocusItemName");
@@ -605,7 +605,7 @@ void tst_applicationwindow::activeFocusControl_data()
QTest::newRow("Frame:SpinBox") << QByteArray("container_frame") << QByteArray("spinContent_frame") << QByteArray("spinBox_frame");
}
-void tst_applicationwindow::activeFocusControl()
+void tst_QQuickApplicationWindow::activeFocusControl()
{
QFETCH(QByteArray, containerName);
QFETCH(QByteArray, activeFocusItemName);
@@ -645,7 +645,7 @@ void tst_applicationwindow::activeFocusControl()
QCOMPARE(window->activeFocusControl(), activeFocusControl);
}
-void tst_applicationwindow::focusAfterPopupClosed()
+void tst_QQuickApplicationWindow::focusAfterPopupClosed()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -723,7 +723,7 @@ void tst_applicationwindow::focusAfterPopupClosed()
QCOMPARE(focusScopeSpy.count(), 3);
}
-void tst_applicationwindow::clearFocusOnDestruction()
+void tst_QQuickApplicationWindow::clearFocusOnDestruction()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -764,7 +764,7 @@ void tst_applicationwindow::clearFocusOnDestruction()
QCOMPARE(spy.count(), 1);
}
-void tst_applicationwindow::layout()
+void tst_QQuickApplicationWindow::layout()
{
QQmlEngine engine;
QQmlComponent component(&engine);
@@ -813,10 +813,10 @@ void tst_applicationwindow::layout()
class FriendlyApplicationWindow : public QQuickApplicationWindow
{
- friend class tst_applicationwindow;
+ friend class tst_QQuickApplicationWindow;
};
-void tst_applicationwindow::componentComplete()
+void tst_QQuickApplicationWindow::componentComplete()
{
FriendlyApplicationWindow cppWindow;
QVERIFY(cppWindow.isComponentComplete());
@@ -833,6 +833,6 @@ void tst_applicationwindow::componentComplete()
QVERIFY(qmlWindow->isComponentComplete());
}
-QTEST_MAIN(tst_applicationwindow)
+QTEST_MAIN(tst_QQuickApplicationWindow)
-#include "tst_applicationwindow.moc"
+#include "tst_qquickapplicationwindow.moc"