diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/qtquick2/qquickflipable | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquickflipable')
5 files changed, 0 insertions, 178 deletions
diff --git a/tests/auto/qtquick2/qquickflipable/data/crash.qml b/tests/auto/qtquick2/qquickflipable/data/crash.qml deleted file mode 100644 index a0327918cb..0000000000 --- a/tests/auto/qtquick2/qquickflipable/data/crash.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -Flipable { - transform: Rotation { - axis.y: 1 - axis.z: 0 - angle: 180 - } -} diff --git a/tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml b/tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml deleted file mode 100644 index 90fc03a5f9..0000000000 --- a/tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - Flipable { - id: flipable - } - Rectangle { - visible: flipable.side == Flipable.Front - } -} diff --git a/tests/auto/qtquick2/qquickflipable/data/test-flipable.qml b/tests/auto/qtquick2/qquickflipable/data/test-flipable.qml deleted file mode 100644 index dff6d3fe39..0000000000 --- a/tests/auto/qtquick2/qquickflipable/data/test-flipable.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -Flipable { - id: flipable - width: 640; height: 480 - - front: Rectangle { anchors.fill: flipable } - back: Rectangle { anchors.fill: flipable } -} diff --git a/tests/auto/qtquick2/qquickflipable/qquickflipable.pro b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro deleted file mode 100644 index 3afad837fe..0000000000 --- a/tests/auto/qtquick2/qquickflipable/qquickflipable.pro +++ /dev/null @@ -1,15 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickflipable -macx:CONFIG -= app_bundle - -SOURCES += tst_qquickflipable.cpp - -include (../../shared/util.pri) - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp b/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp deleted file mode 100644 index c2c40c9746..0000000000 --- a/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include <qtest.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtQuick/qquickview.h> -#include <private/qquickflipable_p.h> -#include <private/qdeclarativevaluetype_p.h> -#include <QFontMetrics> -#include <QtQuick/private/qquickrectangle_p.h> -#include <math.h> -#include <QtOpenGL/QGLShaderProgram> -#include "../../shared/util.h" - -class tst_qquickflipable : public QDeclarativeDataTest -{ - Q_OBJECT -public: - -private slots: - void create(); - void checkFrontAndBack(); - void setFrontAndBack(); - - // below here task issues - void QTBUG_9161_crash(); - void QTBUG_8474_qgv_abort(); - -private: - QDeclarativeEngine engine; -}; - -void tst_qquickflipable::create() -{ - QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, testFileUrl("test-flipable.qml")); - QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create()); - - QVERIFY(obj != 0); - delete obj; -} - -void tst_qquickflipable::checkFrontAndBack() -{ - QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, testFileUrl("test-flipable.qml")); - QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create()); - - QVERIFY(obj != 0); - QVERIFY(obj->front() != 0); - QVERIFY(obj->back() != 0); - delete obj; -} - -void tst_qquickflipable::setFrontAndBack() -{ - QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, testFileUrl("test-flipable.qml")); - QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create()); - - QVERIFY(obj != 0); - QVERIFY(obj->front() != 0); - QVERIFY(obj->back() != 0); - - QString message = c.url().toString() + ":3:1: QML Flipable: front is a write-once property"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - obj->setFront(new QQuickRectangle()); - - message = c.url().toString() + ":3:1: QML Flipable: back is a write-once property"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - obj->setBack(new QQuickRectangle()); - delete obj; -} - -void tst_qquickflipable::QTBUG_9161_crash() -{ - QQuickView *canvas = new QQuickView; - canvas->setSource(testFileUrl("crash.qml")); - QQuickItem *root = canvas->rootObject(); - QVERIFY(root != 0); - canvas->show(); - delete canvas; -} - -void tst_qquickflipable::QTBUG_8474_qgv_abort() -{ - QQuickView *canvas = new QQuickView; - canvas->setSource(testFileUrl("flipable-abort.qml")); - QQuickItem *root = canvas->rootObject(); - QVERIFY(root != 0); - canvas->show(); - delete canvas; -} - -QTEST_MAIN(tst_qquickflipable) - -#include "tst_qquickflipable.moc" |