aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-02-16 14:43:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-24 04:51:31 +0100
commitb855240b782395f94315f43ea3e7e182299fac48 (patch)
treebc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp
parent6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (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/qquickscreen/tst_qquickscreen.cpp')
-rw-r--r--tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp77
1 files changed, 0 insertions, 77 deletions
diff --git a/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp b/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp
deleted file mode 100644
index bb687f7596..0000000000
--- a/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp
+++ /dev/null
@@ -1,77 +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 <QDebug>
-#include <QtQuick/QQuickItem>
-#include <QtQuick/QQuickView>
-#include <QtGui/QScreen>
-#include "../../shared/util.h"
-
-class tst_qquickscreen : public QDeclarativeDataTest
-{
- 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"