6 files changed, 0 insertions, 295 deletions
diff --git a/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf b/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf
deleted file mode 100644
index aae50d5035..0000000000
--- a/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf b/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml b/tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml
deleted file mode 100644
index 0eafdfa17b..0000000000
--- a/tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: test
-    property variant fontloader: fontloaderelement
-    height: 100; width: 100
-    property bool usename: false
-    property int statenum: 1
-    property alias name: fontloaderelement.name
-    property alias source: fontloaderelement.source
-    property alias status: fontloaderelement.status
-
-    FontLoader {
-        id: fontloaderelement
-    }
-
-    states: [
-        State { name: "start"; when: !usename
-            PropertyChanges { target: fontloaderelement; source: "tarzeau_ocr_a.ttf" }
-        },
-        State { name: "changefont"; when: usename
-            PropertyChanges { target: fontloaderelement; name: "Tahoma" }
-        }
-    ]
-
-    Text { id: textelement; text: fontloaderelement.name; color: "black" }
-}
diff --git a/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf b/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf
deleted file mode 100644
index cf93f9651f..0000000000
--- a/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf
+++ /dev/null
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
deleted file mode 100644
index 3efde621b2..0000000000
--- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qdeclarativefontloader
-macx:CONFIG -= app_bundle
-
-HEADERS += ../../declarative/shared/testhttpserver.h
-SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp
-
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
-
-CONFIG += parallel_test
-
-QT += core-private gui-private declarative-private network testlib
diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
deleted file mode 100644
index 6e81befad8..0000000000
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 <QtTest/QSignalSpy>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#include <QtDeclarative/private/qdeclarativefontloader_p.h>
-#include "../shared/util.h"
-#include "../../declarative/shared/testhttpserver.h"
-#include <QQuickView>
-#include <QQuickItem>
-
-#define SERVER_PORT 14448
-
-class tst_qdeclarativefontloader : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qdeclarativefontloader();
-
-private slots:
-    void init();
-    void noFont();
-    void namedFont();
-    void localFont();
-    void failLocalFont();
-    void webFont();
-    void redirWebFont();
-    void failWebFont();
-    void changeFont();
-    void changeFontSourceViaState();
-
-private:
-    QDeclarativeEngine engine;
-    TestHTTPServer server;
-};
-
-tst_qdeclarativefontloader::tst_qdeclarativefontloader() :
-    server(SERVER_PORT)
-{
-    server.serveDirectory(TESTDATA(""));
-}
-
-void tst_qdeclarativefontloader::init()
-{
-    QVERIFY(server.isValid());
-}
-
-void tst_qdeclarativefontloader::noFont()
-{
-    QString componentStr = "import QtQuick 2.0\nFontLoader { }";
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QCOMPARE(fontObject->name(), QString(""));
-    QCOMPARE(fontObject->source(), QUrl(""));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Null);
-
-    delete fontObject;
-}
-
-void tst_qdeclarativefontloader::namedFont()
-{
-    QString componentStr = "import QtQuick 2.0\nFontLoader { name: \"Helvetica\" }";
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QCOMPARE(fontObject->source(), QUrl(""));
-    QCOMPARE(fontObject->name(), QString("Helvetica"));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-}
-
-void tst_qdeclarativefontloader::localFont()
-{
-    QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + TESTDATA("tarzeau_ocr_a.ttf") + "\" }";
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-}
-
-void tst_qdeclarativefontloader::failLocalFont()
-{
-    QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + QUrl::fromLocalFile(TESTDATA("dummy.ttf")).toString() + "\" }";
-    QTest::ignoreMessage(QtWarningMsg, QString("file::2:1: QML FontLoader: Cannot load font: \"" + QUrl::fromLocalFile(TESTDATA("dummy.ttf")).toString() + "\"").toUtf8().constData());
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
-}
-
-void tst_qdeclarativefontloader::webFont()
-{
-    QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/tarzeau_ocr_a.ttf\" }";
-    QDeclarativeComponent component(&engine);
-
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-}
-
-void tst_qdeclarativefontloader::redirWebFont()
-{
-    server.addRedirect("olddir/oldname.ttf","../tarzeau_ocr_a.ttf");
-
-    QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/olddir/oldname.ttf\" }";
-    QDeclarativeComponent component(&engine);
-
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-}
-
-void tst_qdeclarativefontloader::failWebFont()
-{
-    QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/nonexist.ttf\" }";
-    QTest::ignoreMessage(QtWarningMsg, "file::2:1: QML FontLoader: Cannot load font: \"http://localhost:14448/nonexist.ttf\"");
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
-}
-
-void tst_qdeclarativefontloader::changeFont()
-{
-    QString componentStr = "import QtQuick 2.0\nFontLoader { source: font }";
-    QDeclarativeContext *ctxt = engine.rootContext();
-    ctxt->setContextProperty("font", QUrl::fromLocalFile(TESTDATA("tarzeau_ocr_a.ttf")));
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-
-    QSignalSpy nameSpy(fontObject, SIGNAL(nameChanged()));
-    QSignalSpy statusSpy(fontObject, SIGNAL(statusChanged()));
-
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-    QCOMPARE(nameSpy.count(), 0);
-    QCOMPARE(statusSpy.count(), 0);
-    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-
-    ctxt->setContextProperty("font", "http://localhost:14448/daniel.ttf");
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Loading);
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-    QCOMPARE(nameSpy.count(), 1);
-    QCOMPARE(statusSpy.count(), 2);
-    QTRY_COMPARE(fontObject->name(), QString("Daniel"));
-
-    ctxt->setContextProperty("font", QUrl::fromLocalFile(TESTDATA("tarzeau_ocr_a.ttf")));
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-    QCOMPARE(nameSpy.count(), 2);
-    QCOMPARE(statusSpy.count(), 2);
-    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-
-    ctxt->setContextProperty("font", "http://localhost:14448/daniel.ttf");
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-    QCOMPARE(nameSpy.count(), 3);
-    QCOMPARE(statusSpy.count(), 2);
-    QTRY_COMPARE(fontObject->name(), QString("Daniel"));
-}
-
-void tst_qdeclarativefontloader::changeFontSourceViaState()
-{
-    QQuickView canvas(QUrl::fromLocalFile(TESTDATA("qtbug-20268.qml")));
-    canvas.show();
-    canvas.requestActivateWindow();
-    QTest::qWaitForWindowShown(&canvas);
-    QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
-
-    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(qvariant_cast<QObject *>(canvas.rootObject()->property("fontloader")));
-    QVERIFY(fontObject != 0);
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-
-    canvas.rootObject()->setProperty("usename", true);
-
-    // This warning should probably not be printed once QTBUG-20268 is fixed
-    QString warning = QString(QUrl::fromLocalFile(TESTDATA("qtbug-20268.qml")).toString()) +
-                              QLatin1String(":13:5: QML FontLoader: Cannot load font: \"\"");
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
-
-    QEXPECT_FAIL("", "QTBUG-20268", Abort);
-    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
-    QCOMPARE(canvas.rootObject()->property("name").toString(), QString("Tahoma"));
-}
-
-QTEST_MAIN(tst_qdeclarativefontloader)
-
-#include "tst_qdeclarativefontloader.moc"