qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename tst_applicationwindow to tst_QQuickApplicationWindow 

Change-Id: If9fc2bb41cf251af71479b25656240e0d3c238d8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
J-P Nurmi 2017-09-27 14:48:17 +02:00
parent c5e60dbf00
commit 125c08cad1
15 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -27,7 +27,6 @@
/examples/quickcontrols2/wearable/wearable
/tests/auto/accessibility/tst_accessibility
/tests/auto/applicationwindow/tst_applicationwindow
/tests/auto/calendar/tst_calendar
/tests/auto/controls/default/tst_default
/tests/auto/controls/material/tst_material
@ -38,6 +37,7 @@
/tests/auto/menu/tst_menu
/tests/auto/platform/tst_platform
/tests/auto/pressandhold/tst_pressandhold
/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow
/tests/auto/qquickdrawer/tst_qquickdrawer
/tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle
/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf

4
tests/auto/auto.pro
View File

@ -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

0
tests/auto/applicationwindow/data/activeFocusControl.qml → tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
View File

0
tests/auto/applicationwindow/data/activefocusontab.qml → tests/auto/qquickapplicationwindow/data/activefocusontab.qml
View File

0
tests/auto/applicationwindow/data/attachedProperties.qml → tests/auto/qquickapplicationwindow/data/attachedProperties.qml
View File

0
tests/auto/applicationwindow/data/basicapplicationwindow.qml → tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
View File

0
tests/auto/applicationwindow/data/clearfocusondestruction.qml → tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
View File

0
tests/auto/applicationwindow/data/defaultFocus.qml → tests/auto/qquickapplicationwindow/data/defaultFocus.qml
View File

0
tests/auto/applicationwindow/data/fill.qml → tests/auto/qquickapplicationwindow/data/fill.qml
View File

0
tests/auto/applicationwindow/data/focusAfterPopupClosed.qml → tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
View File

0
tests/auto/applicationwindow/data/font.qml → tests/auto/qquickapplicationwindow/data/font.qml
View File

0
tests/auto/applicationwindow/data/layout.qml → tests/auto/qquickapplicationwindow/data/layout.qml
View File

0
tests/auto/applicationwindow/data/locale.qml → tests/auto/qquickapplicationwindow/data/locale.qml
View File

4
tests/auto/applicationwindow/applicationwindow.pro → tests/auto/qquickapplicationwindow/qquickapplicationwindow.pro
View File

@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_applicationwindow
SOURCES += tst_applicationwindow.cpp
TARGET = tst_qquickapplicationwindow
SOURCES += tst_qquickapplicationwindow.cpp
macos:CONFIG -= app_bundle

38
tests/auto/applicationwindow/tst_applicationwindow.cpp → tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
View File

@ -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"