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/quick/qquickscreen | |
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/quick/qquickscreen')
-rw-r--r-- | tests/auto/quick/qquickscreen/data/screen.qml | 11 | ||||
-rw-r--r-- | tests/auto/quick/qquickscreen/qquickscreen.pro | 10 | ||||
-rw-r--r-- | tests/auto/quick/qquickscreen/tst_qquickscreen.cpp | 77 |
3 files changed, 98 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickscreen/data/screen.qml b/tests/auto/quick/qquickscreen/data/screen.qml new file mode 100644 index 0000000000..780b22f23d --- /dev/null +++ b/tests/auto/quick/qquickscreen/data/screen.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import QtQuick.Window 2.0 as Window + +Item { + width: 100 + height: 100 + property int w: Window.Screen.width + property int h: Window.Screen.height + property int curOrientation: Window.Screen.orientation + property int priOrientation: Window.Screen.primaryOrientation +} diff --git a/tests/auto/quick/qquickscreen/qquickscreen.pro b/tests/auto/quick/qquickscreen/qquickscreen.pro new file mode 100644 index 0000000000..00ec51ef33 --- /dev/null +++ b/tests/auto/quick/qquickscreen/qquickscreen.pro @@ -0,0 +1,10 @@ +CONFIG += testcase +TARGET = tst_qquickscreen +SOURCES += tst_qquickscreen.cpp + +include (../../shared/util.pri) + +macx:CONFIG -= app_bundle + +CONFIG += parallel_test +QT += core-private gui-private qml-private testlib quick-private diff --git a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp new file mode 100644 index 0000000000..cbf9438f24 --- /dev/null +++ b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** 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 <QDebug> +#include <QtQuick/QQuickItem> +#include <QtQuick/QQuickView> +#include <QtGui/QScreen> +#include "../../shared/util.h" + +class tst_qquickscreen : public QQmlDataTest +{ + Q_OBJECT +private slots: + void basicProperties(); +}; + +void tst_qquickscreen::basicProperties() +{ + QQuickView view; + view.setSource(testFileUrl("screen.qml")); + view.show(); + QTest::qWaitForWindowShown(&view); + + QQuickItem* root = view.rootObject(); + QVERIFY(root); + + QScreen* screen = view.screen(); + QVERIFY(screen); + + QCOMPARE(screen->size().width(), root->property("w").toInt()); + QCOMPARE(screen->size().height(), root->property("h").toInt()); + QCOMPARE(int(screen->orientation()), root->property("curOrientation").toInt()); + QCOMPARE(int(screen->primaryOrientation()), root->property("priOrientation").toInt()); +} + +QTEST_MAIN(tst_qquickscreen) + +#include "tst_qquickscreen.moc" |