diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-12 12:02:02 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-13 14:16:41 +0000 |
commit | d4e9c964a2d17d0dbdd9c7c9599bf502ce995d9c (patch) | |
tree | c4db6898ecec09407edc67c406cd4cda4fdd50d3 | |
parent | 3e40325d44c64f2c3fa3403e9efd6a51759ec0e9 (diff) |
Rename tst_material and tst_universal
These test specificly the QQuickMaterialStyle and QQuickUniversalStyle
implementations, so rename appropriately to make room for the upcoming
tst_material and tst_universal tests. See the next commit for more
details about that.
Change-Id: I08d6116d6219084f6087682b7e712f8499a0e945
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | tests/auto/auto.pro | 6 | ||||
-rw-r--r-- | tests/auto/qquickmaterialstyle/data/tst_material.qml (renamed from tests/auto/material/data/tst_material.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro (renamed from tests/auto/universal/universal.pro) | 6 | ||||
-rw-r--r-- | tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc (renamed from tests/auto/material/material.qrc) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmaterialstyle/qtquickcontrols2.conf (renamed from tests/auto/material/qtquickcontrols2.conf) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle.cpp (renamed from tests/auto/material/tst_material.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qquickuniversalstyle/data/tst_universal.qml (renamed from tests/auto/universal/data/tst_universal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro (renamed from tests/auto/material/material.pro) | 6 | ||||
-rw-r--r-- | tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc (renamed from tests/auto/universal/universal.qrc) | 0 | ||||
-rw-r--r-- | tests/auto/qquickuniversalstyle/qtquickcontrols2.conf (renamed from tests/auto/universal/qtquickcontrols2.conf) | 0 | ||||
-rw-r--r-- | tests/auto/qquickuniversalstyle/tst_qquickuniversalstyle.cpp (renamed from tests/auto/universal/tst_universal.cpp) | 4 |
12 files changed, 17 insertions, 17 deletions
@@ -18,16 +18,16 @@ /tests/auto/controls/tst_controls /tests/auto/drawer/tst_drawer /tests/auto/focus/tst_focus -/tests/auto/material/tst_material /tests/auto/menu/tst_menu /tests/auto/popup/tst_popup /tests/auto/pressandhold/tst_pressandhold +/tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle /tests/auto/qquickstyle/tst_qquickstyle /tests/auto/qquickstyleselector/tst_qquickstyleselector +/tests/auto/qquickuniversalstyle/tst_qquickuniversalstyle /tests/auto/sanity/tst_sanity /tests/auto/snippets/tst_snippets /tests/auto/styles/tst_styles -/tests/auto/universal/tst_universal /tests/benchmarks/creationtime/tst_creationtime /tests/benchmarks/objectcount/tst_objectcount /tests/manual/fonts/fonts diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index bf608c17..4e6672c6 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,16 +5,16 @@ SUBDIRS += \ calendar \ controls \ drawer \ - material \ menu \ popup \ pressandhold \ + qquickmaterialstyle \ qquickstyle \ qquickstyleselector \ + qquickuniversalstyle \ sanity \ snippets \ - styles \ - universal + styles # QTBUG-50295 !linux: SUBDIRS += \ diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml index 593b5ccb..7305b732 100644 --- a/tests/auto/material/data/tst_material.qml +++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/universal/universal.pro b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro index bb7a85ca..eac9bdc4 100644 --- a/tests/auto/universal/universal.pro +++ b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro @@ -1,12 +1,12 @@ TEMPLATE = app -TARGET = tst_universal +TARGET = tst_qquickmaterialstyle CONFIG += qmltestcase SOURCES += \ - $$PWD/tst_universal.cpp + $$PWD/tst_qquickmaterialstyle.cpp RESOURCES += \ - $$PWD/universal.qrc + $$PWD/qquickmaterialstyle.qrc OTHER_FILES += \ $$PWD/data/* diff --git a/tests/auto/material/material.qrc b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc index 53ba6450..53ba6450 100644 --- a/tests/auto/material/material.qrc +++ b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc diff --git a/tests/auto/material/qtquickcontrols2.conf b/tests/auto/qquickmaterialstyle/qtquickcontrols2.conf index b6c7c87e..b6c7c87e 100644 --- a/tests/auto/material/qtquickcontrols2.conf +++ b/tests/auto/qquickmaterialstyle/qtquickcontrols2.conf diff --git a/tests/auto/material/tst_material.cpp b/tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle.cpp index 5db9c12b..eeee1e87 100644 --- a/tests/auto/material/tst_material.cpp +++ b/tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -35,4 +35,4 @@ ****************************************************************************/ #include <QtQuickTest/quicktest.h> -QUICK_TEST_MAIN(tst_material) +QUICK_TEST_MAIN(tst_qquickmaterialstyle) diff --git a/tests/auto/universal/data/tst_universal.qml b/tests/auto/qquickuniversalstyle/data/tst_universal.qml index 0bc0d09d..7ee14da8 100644 --- a/tests/auto/universal/data/tst_universal.qml +++ b/tests/auto/qquickuniversalstyle/data/tst_universal.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/material/material.pro b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro index 52663fdc..83bd19a5 100644 --- a/tests/auto/material/material.pro +++ b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro @@ -1,12 +1,12 @@ TEMPLATE = app -TARGET = tst_material +TARGET = tst_qquickuniversalstyle CONFIG += qmltestcase SOURCES += \ - $$PWD/tst_material.cpp + $$PWD/tst_qquickuniversalstyle.cpp RESOURCES += \ - $$PWD/material.qrc + $$PWD/qquickuniversalstyle.qrc OTHER_FILES += \ $$PWD/data/* diff --git a/tests/auto/universal/universal.qrc b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc index 53ba6450..53ba6450 100644 --- a/tests/auto/universal/universal.qrc +++ b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc diff --git a/tests/auto/universal/qtquickcontrols2.conf b/tests/auto/qquickuniversalstyle/qtquickcontrols2.conf index 8c6dd807..8c6dd807 100644 --- a/tests/auto/universal/qtquickcontrols2.conf +++ b/tests/auto/qquickuniversalstyle/qtquickcontrols2.conf diff --git a/tests/auto/universal/tst_universal.cpp b/tests/auto/qquickuniversalstyle/tst_qquickuniversalstyle.cpp index ea42cc5e..a4033412 100644 --- a/tests/auto/universal/tst_universal.cpp +++ b/tests/auto/qquickuniversalstyle/tst_qquickuniversalstyle.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -35,4 +35,4 @@ ****************************************************************************/ #include <QtQuickTest/quicktest.h> -QUICK_TEST_MAIN(tst_universal) +QUICK_TEST_MAIN(tst_qquickuniversalstyle) |