diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 16:52:36 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 00:39:18 +0100 |
commit | 01dc7e2ea476e0e6dcdce2e72979bbc858f4057d (patch) | |
tree | d8796f7695bbf8ad42abf47cd84c1b5e000ef795 /tests/auto/qtquick1/moduleqt47 | |
parent | 5e07b57b818326da47a46d384415041fa4cea0ba (diff) |
Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.
Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick1/moduleqt47')
-rw-r--r-- | tests/auto/qtquick1/moduleqt47/data/importqt47.qml | 80 | ||||
-rw-r--r-- | tests/auto/qtquick1/moduleqt47/moduleqt47.pro | 11 | ||||
-rw-r--r-- | tests/auto/qtquick1/moduleqt47/tst_moduleqt47.cpp | 137 |
3 files changed, 0 insertions, 228 deletions
diff --git a/tests/auto/qtquick1/moduleqt47/data/importqt47.qml b/tests/auto/qtquick1/moduleqt47/data/importqt47.qml deleted file mode 100644 index 0a1b533cba..0000000000 --- a/tests/auto/qtquick1/moduleqt47/data/importqt47.qml +++ /dev/null @@ -1,80 +0,0 @@ -import Qt 4.7 - -Item { - QtObject {} - - Component { Item {} } - - // Util - states: [ - State { - name: "bob" - AnchorChanges {} - ParentChange {} - StateChangeScript {} - PropertyChanges {} - } - ] - transitions: [ - Transition { - AnchorAnimation {} - ColorAnimation {} - SmoothedAnimation {} - NumberAnimation {} - ParallelAnimation {} - ParentAnimation {} - PauseAnimation {} - PropertyAnimation {} - RotationAnimation {} - ScriptAction {} - SequentialAnimation {} - SpringAnimation {} - Vector3dAnimation {} - } - ] - - Behavior on x {} - Binding {} - Connections {} - FontLoader {} - ListModel { ListElement {} } - SystemPalette {} - Timer {} - - // graphic items - BorderImage {} - Column {} - MouseArea {} - Flickable {} - Flipable {} - Flow {} - FocusPanel {} - FocusScope {} - Rectangle { gradient: Gradient { GradientStop {} } } - Grid {} - GridView {} - Image {} - ListView {} - Loader {} - PathView { - path: Path { - PathLine {} - PathCubic {} - PathPercent {} - PathQuad {} - PathAttribute {} - } - } - Repeater {} - Rotation {} - Row {} - Translate {} - Scale {} - Text {} - TextEdit {} - TextInput {} - VisualItemModel {} - VisualDataModel {} - - Keys.onPressed: console.log("Press") -} diff --git a/tests/auto/qtquick1/moduleqt47/moduleqt47.pro b/tests/auto/qtquick1/moduleqt47/moduleqt47.pro deleted file mode 100644 index d751ea0b86..0000000000 --- a/tests/auto/qtquick1/moduleqt47/moduleqt47.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_moduleqt47 -macx:CONFIG -= app_bundle - -SOURCES += tst_moduleqt47.cpp - -DEFINES += SRCDIR=\\\"$$PWD\\\" - -CONFIG += parallel_test - -QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib diff --git a/tests/auto/qtquick1/moduleqt47/tst_moduleqt47.cpp b/tests/auto/qtquick1/moduleqt47/tst_moduleqt47.cpp deleted file mode 100644 index 6c04ad262c..0000000000 --- a/tests/auto/qtquick1/moduleqt47/tst_moduleqt47.cpp +++ /dev/null @@ -1,137 +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 <QDir> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QDebug> - -class tst_moduleqt47 : public QObject -{ - Q_OBJECT -public: - tst_moduleqt47(); - -private slots: - void create(); - - void accidentalImport_data(); - void accidentalImport(); - -private: - QStringList findFiles(const QDir &d); - - QDeclarativeEngine engine; - QStringList excludedFiles; -}; - -tst_moduleqt47::tst_moduleqt47() -{ - excludedFiles << "tests/auto/qtquick1/moduleqt47/data/importqt47.qml" - << "doc/src/declarative/whatsnew.qdoc" - << "doc/src/qtquick1/whatsnew.qdoc"; -} - -void tst_moduleqt47::create() -{ - QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/importqt47.qml")); - QObject *obj = qobject_cast<QObject*>(c.create()); - if (!obj) - qWarning() << c.errorString(); - - QVERIFY(obj != 0); - delete obj; -} - -QStringList tst_moduleqt47::findFiles(const QDir &d) -{ - QStringList rv; - - QStringList files = d.entryList(QStringList() << QLatin1String("*.qml") << QLatin1String("*.qdoc"), QDir::Files); - foreach (const QString &file, files) { - - QString absFile = d.absoluteFilePath(file); - - bool skip = false; - for (int ii = 0; !skip && ii < excludedFiles.count(); ++ii) - skip = (absFile.endsWith(excludedFiles.at(ii))); - - if (!skip) - rv << absFile; - } - - QStringList dirs = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); - foreach (const QString &dir, dirs) { - QDir sub = d; - sub.cd(dir); - rv << findFiles(sub); - } - - return rv; -} - -void tst_moduleqt47::accidentalImport_data() -{ - QTest::addColumn<QString>("file"); - QStringList files = findFiles(QDir(SRCDIR "/../../../../")); - - foreach(const QString &file, files) - QTest::newRow(qPrintable(file)) << file; -} - -void tst_moduleqt47::accidentalImport() -{ - QFETCH(QString, file); - - QFile f(file); - if (!f.open(QIODevice::ReadOnly)) - return; - QByteArray data = f.readAll(); - - if (data.contains("import Qt 4")) - qDebug() << file; - QVERIFY(!data.contains("import Qt 4")); -} - -QTEST_MAIN(tst_moduleqt47) - -#include "tst_moduleqt47.moc" |