diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativemoduleplugin')
48 files changed, 0 insertions, 1097 deletions
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/implicitQmldir.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/implicitQmldir.errors.txt deleted file mode 100644 index ce3b796e16..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/implicitQmldir.errors.txt +++ /dev/null @@ -1 +0,0 @@ --1:-1:module "" plugin "AType" not found diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/qmldir deleted file mode 100644 index 7f5b3a362d..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -plugin AType - diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/temptest.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/temptest.qml deleted file mode 100644 index 67fb18feb0..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/temptest.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - -// this qml file uses a type which is meant to be defined -// in a plugin which is specified in the qmldir file. -// however, that plugin doesn't exist, so it cannot be -// loaded, and hence the AItem type will be an unknown type. - -Item { - id: root - - AItem { - id: unknown - } -} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/Test.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/Test.qml deleted file mode 100644 index ea9611691e..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/Test.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - id: moduleRoot -} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/implicitQmldir.2.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/implicitQmldir.2.errors.txt deleted file mode 100644 index 9cafb78740..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/implicitQmldir.2.errors.txt +++ /dev/null @@ -1,3 +0,0 @@ -1:12:unexpected token -1:-1:expected '.' -2:17:unexpected token diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/qmldir deleted file mode 100644 index 7c4def92fc..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -foo bar foo bar -internal foo bar foo -Test 1.0 Test.qml diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/temptest2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/temptest2.qml deleted file mode 100644 index 0fa9f6e051..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/temptest2.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -// the type loader will implicitly search "." for a qmldir -// and the qmldir has various syntax errors in it. - -Item { - id: root -} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml deleted file mode 100644 index a0ac0c72c7..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml +++ /dev/null @@ -1,21 +0,0 @@ -import com.nokia.AutoTestQmlMixedPluginType 1.5 -import QtQuick 2.0 - -Item { - property bool test: false - property bool test2: false - - Bar { - id: bar - } - - Foo { - id: foo - } - - Component.onCompleted: { - test = (bar.value == 16); - test2 = (foo.value == 89); - } -} - diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml deleted file mode 100644 index 1346cbdb7b..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml +++ /dev/null @@ -1,13 +0,0 @@ -import com.nokia.AutoTestQmlMixedPluginType 1.0 -import QtQuick 2.0 - -Item { - property bool test: false - Bar { - id: bar - } - - Component.onCompleted: { - test = (bar.value == 16); - } -} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/incorrectCase.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/incorrectCase.qml deleted file mode 100644 index a21ece7058..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/incorrectCase.qml +++ /dev/null @@ -1,4 +0,0 @@ -import com.nokia.WrongCase 1.0 - -MyPluginType { value: 123 } - diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml deleted file mode 100644 index a9e28e5d8b..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml +++ /dev/null @@ -1,3 +0,0 @@ -import com.nokia.AutoTestPluginWithQmlFile 1.0 - -MyQmlFile {} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt deleted file mode 100644 index a40c1c8211..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt +++ /dev/null @@ -1 +0,0 @@ -1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.9 is not installed diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml deleted file mode 100644 index bda59f0a32..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml +++ /dev/null @@ -1,5 +0,0 @@ -import com.nokia.AutoTestQmlVersionPluginType 1.9 -import QtQuick 2.0 - -QtObject { -} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt deleted file mode 100644 index 2634223de7..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt +++ /dev/null @@ -1 +0,0 @@ -1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.1 is not installed diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml deleted file mode 100644 index 2e556e76d6..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml +++ /dev/null @@ -1,6 +0,0 @@ -import com.nokia.AutoTestQmlVersionPluginType 1.1 -import QtQuick 2.0 - -QtObject { -} - diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works.qml deleted file mode 100644 index f29ae24ea2..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/works.qml +++ /dev/null @@ -1,3 +0,0 @@ -import com.nokia.AutoTestQmlPluginType 1.0 - -MyPluginType { value: 123 } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml deleted file mode 100644 index cc322bf26b..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml +++ /dev/null @@ -1,3 +0,0 @@ -import com.nokia.AutoTestQmlPluginType 2.0 - -MyPluginType { valueOnlyIn2: 123 } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml deleted file mode 100644 index c08160ac5a..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml +++ /dev/null @@ -1,3 +0,0 @@ -import com.nokia.AutoTestQmlPluginType 2.1 - -MyPluginType { valueOnlyIn2: 123 } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/empty.json b/tests/auto/declarative/qdeclarativemoduleplugin/empty.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/empty.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml deleted file mode 100644 index 617bdaaf67..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml +++ /dev/null @@ -1,3 +0,0 @@ -import QtQuick 2.0 - -Item {} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir deleted file mode 100644 index 858ba1450e..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -MyQmlFile 1.0 MyQmlFile.qml -plugin pluginWithQmlFile - diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml deleted file mode 100644 index 36d69e901f..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - property int value: 89 -} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir deleted file mode 100644 index 065dc3b21f..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -plugin pluginMixed -Foo 1.5 Foo.qml diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir deleted file mode 100644 index 0a8b5d46eb..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin plugin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir deleted file mode 100644 index 0a8b5d46eb..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin plugin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType/qmldir deleted file mode 100644 index 0a8b5d46eb..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin plugin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir deleted file mode 100644 index 640967fe40..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin pluginVersion diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml deleted file mode 100644 index 617bdaaf67..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml +++ /dev/null @@ -1,3 +0,0 @@ -import QtQuick 2.0 - -Item {} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml deleted file mode 100644 index fac5d8f4b9..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml +++ /dev/null @@ -1,4 +0,0 @@ -import QtQuick 2.0 - -Item {} - diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/qmldir deleted file mode 100644 index 167bb10c21..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -ComponentA 1.0 ComponentA.qml -ComponentB 1.0 ComponentB.qml - diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/WrongCase/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/WrongCase/qmldir deleted file mode 100644 index 6c8787498f..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/WrongCase/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin PluGin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro deleted file mode 100644 index 21835613af..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -SOURCES = plugin.cpp -QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1 - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp deleted file mode 100644 index a8a0f69a3a..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp +++ /dev/null @@ -1,84 +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 <QStringList> -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDebug> - -class MyPluginType : public QObject -{ - Q_OBJECT - Q_PROPERTY(int value READ value WRITE setValue) - Q_PROPERTY(int valueOnlyIn2 READ value WRITE setValue) - -public: - MyPluginType(QObject *parent=0) : QObject(parent) - { - qWarning("import2.1 worked"); - } - - int value() const { return v; } - void setValue(int i) { v = i; } - -private: - int v; -}; - - -class MyPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "../empty.json") - -public: - MyPlugin() - { - qWarning("plugin2.1 created"); - } - - void registerTypes(const char *uri) - { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); - qmlRegisterType<MyPluginType>(uri, 2, 1, "MyPluginType"); - } -}; - -#include "plugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro deleted file mode 100644 index 6d4f5fb301..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -SOURCES = plugin.cpp -QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2 - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp deleted file mode 100644 index c67b5b1b63..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp +++ /dev/null @@ -1,84 +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 <QStringList> -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDebug> - -class MyPluginType : public QObject -{ - Q_OBJECT - Q_PROPERTY(int value READ value WRITE setValue) - Q_PROPERTY(int valueOnlyIn2 READ value WRITE setValue) - -public: - MyPluginType(QObject *parent=0) : QObject(parent) - { - qWarning("import2 worked"); - } - - int value() const { return v; } - void setValue(int i) { v = i; } - -private: - int v; -}; - - -class MyPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "../empty.json") - -public: - MyPlugin() - { - qWarning("plugin2 created"); - } - - void registerTypes(const char *uri) - { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); - qmlRegisterType<MyPluginType>(uri, 2, 0, "MyPluginType"); - } -}; - -#include "plugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp deleted file mode 100644 index 869630bd63..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp +++ /dev/null @@ -1,83 +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 <QStringList> -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDebug> - -class MyPluginType : public QObject -{ - Q_OBJECT - Q_PROPERTY(int value READ value WRITE setValue) - -public: - MyPluginType(QObject *parent=0) : QObject(parent) - { - qWarning("import worked"); - } - - int value() const { return v; } - void setValue(int i) { v = i; } - -private: - int v; -}; - - -class MyPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "../empty.json") - -public: - MyPlugin() - { - qWarning("plugin created"); - } - - void registerTypes(const char *uri) - { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); - qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); - } -}; - -#include "plugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro deleted file mode 100644 index 61fab02109..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -SOURCES = plugin.cpp -QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp deleted file mode 100644 index 51e48781f6..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp +++ /dev/null @@ -1,73 +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 <QStringList> -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDebug> - -class BarPluginType : public QObject -{ - Q_OBJECT - Q_PROPERTY(int value READ value) - -public: - int value() const { return 16; } -}; - - -class MyMixedPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "../empty.json") - -public: - MyMixedPlugin() - { - } - - void registerTypes(const char *uri) - { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlMixedPluginType"); - qmlRegisterType<BarPluginType>(uri, 1, 0, "Bar"); - } -}; - -#include "plugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro deleted file mode 100644 index f8b279cbf6..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -SOURCES = plugin.cpp -QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp deleted file mode 100644 index ab8b3d479e..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp +++ /dev/null @@ -1,73 +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 <QStringList> -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDebug> - -class FloorPluginType : public QObject -{ - Q_OBJECT - Q_PROPERTY(int value READ value); - -public: - int value() const { return 16; } -}; - - -class MyMixedPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "../empty.json") - -public: - MyMixedPlugin() - { - } - - void registerTypes(const char *uri) - { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlVersionPluginType"); - qmlRegisterType<FloorPluginType>(uri, 1, 4, "Floor"); - } -}; - -#include "plugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro deleted file mode 100644 index 32e017e79d..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -SOURCES = plugin.cpp -QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp deleted file mode 100644 index 88b807e14d..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp +++ /dev/null @@ -1,58 +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 <QStringList> -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDebug> - -class MyPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "../empty.json") - -public: - void registerTypes(const char *uri) - { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestPluginWithQmlFile"); - } -}; - -#include "plugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro deleted file mode 100644 index 1b496d689a..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -SOURCES = plugin.cpp -QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp deleted file mode 100644 index fe110a28d4..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp +++ /dev/null @@ -1,83 +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 <QStringList> -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDebug> - -class MyPluginType : public QObject -{ - Q_OBJECT - Q_PROPERTY(int value READ value WRITE setValue) - -public: - MyPluginType(QObject *parent=0) : QObject(parent) - { - qWarning("import worked"); - } - - int value() const { return v; } - void setValue(int i) { v = i; } - -private: - int v; -}; - - -class MyPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "../empty.json") - -public: - MyPlugin() - { - qWarning("plugin created"); - } - - void registerTypes(const char *uri) - { - Q_ASSERT(QLatin1String(uri) == "com.nokia.WrongCase"); - qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); - } -}; - -#include "plugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro deleted file mode 100644 index 5d21114a2f..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -SOURCES = plugin.cpp -QT = core declarative -TARGET = Plugin -DESTDIR = ../imports/com/nokia/WrongCase - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro deleted file mode 100644 index 25c6c6ad56..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro +++ /dev/null @@ -1,9 +0,0 @@ -QT = core -TEMPLATE = subdirs -SUBDIRS = plugin plugin.2 plugin.2.1 pluginWrongCase pluginWithQmlFile pluginMixed pluginVersion -tst_qdeclarativemoduleplugin_pro.depends += plugin -SUBDIRS += tst_qdeclarativemoduleplugin.pro - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp deleted file mode 100644 index 46e5358fab..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ /dev/null @@ -1,353 +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.h> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QDebug> - -#include "../../shared/testhttpserver.h" -#include "../../shared/util.h" - -#define SERVER_ADDR "http://127.0.0.1:14450" -#define SERVER_PORT 14450 - - -class tst_qdeclarativemoduleplugin : public QDeclarativeDataTest -{ - Q_OBJECT -public: - -private slots: - virtual void initTestCase(); - void importsPlugin(); - void importsPlugin2(); - void importsPlugin21(); - void importsMixedQmlCppPlugin(); - void incorrectPluginCase(); - void importPluginWithQmlFile(); - void remoteImportWithQuotedUrl(); - void remoteImportWithUnquotedUri(); - void versionNotInstalled(); - void versionNotInstalled_data(); - void implicitQmldir(); - void implicitQmldir_data(); - -private: - QString m_importsDirectory; -}; - -void tst_qdeclarativemoduleplugin::initTestCase() -{ - QDeclarativeDataTest::initTestCase(); - m_importsDirectory = directory() + QStringLiteral("/imports"); - QVERIFY2(QFileInfo(m_importsDirectory).isDir(), - qPrintable(QString::fromLatin1("Imports directory '%1' does not exist.").arg(m_importsDirectory))); -} - -#define VERIFY_ERRORS(errorfile) \ - if (!errorfile) { \ - if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \ - qWarning() << "Unexpected Errors:" << component.errors(); \ - QVERIFY(!component.isError()); \ - QVERIFY(component.errors().isEmpty()); \ - } else { \ - QString verify_errors_file_name = testFile(errorfile); \ - QFile file(verify_errors_file_name); \ - QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \ - QByteArray data = file.readAll(); \ - file.close(); \ - QList<QByteArray> expected = data.split('\n'); \ - expected.removeAll(QByteArray("")); \ - QList<QDeclarativeError> errors = component.errors(); \ - QList<QByteArray> actual; \ - for (int ii = 0; ii < errors.count(); ++ii) { \ - const QDeclarativeError &error = errors.at(ii); \ - QByteArray errorStr = QByteArray::number(error.line()) + ":" + \ - QByteArray::number(error.column()) + ":" + \ - error.description().toUtf8(); \ - actual << errorStr; \ - } \ - if (qgetenv("DEBUG") != "" && expected != actual) { \ - qWarning() << "Expected:" << expected << "Actual:" << actual; \ - } \ - if (qgetenv("QDECLARATIVELANGUAGE_UPDATEERRORS") != "" && expected != actual) {\ - QFile file(testFile(errorfile)); \ - QVERIFY(file.open(QIODevice::WriteOnly)); \ - for (int ii = 0; ii < actual.count(); ++ii) { \ - file.write(actual.at(ii)); file.write("\n"); \ - } \ - file.close(); \ - } else { \ - QCOMPARE(expected, actual); \ - } \ - } - -void tst_qdeclarativemoduleplugin::importsPlugin() -{ - QDeclarativeEngine engine; - engine.addImportPath(m_importsDirectory); - QTest::ignoreMessage(QtWarningMsg, "plugin created"); - QTest::ignoreMessage(QtWarningMsg, "import worked"); - QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("works.qml"))); - foreach (QDeclarativeError err, component.errors()) - qWarning() << err; - VERIFY_ERRORS(0); - QObject *object = component.create(); - QVERIFY(object != 0); - QCOMPARE(object->property("value").toInt(),123); - delete object; -} - -void tst_qdeclarativemoduleplugin::importsPlugin2() -{ - QDeclarativeEngine engine; - engine.addImportPath(m_importsDirectory); - QTest::ignoreMessage(QtWarningMsg, "plugin2 created"); - QTest::ignoreMessage(QtWarningMsg, "import2 worked"); - QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("works2.qml"))); - foreach (QDeclarativeError err, component.errors()) - qWarning() << err; - VERIFY_ERRORS(0); - QObject *object = component.create(); - QVERIFY(object != 0); - QCOMPARE(object->property("value").toInt(),123); - delete object; -} - -void tst_qdeclarativemoduleplugin::importsPlugin21() -{ - QDeclarativeEngine engine; - engine.addImportPath(m_importsDirectory); - QTest::ignoreMessage(QtWarningMsg, "plugin2.1 created"); - QTest::ignoreMessage(QtWarningMsg, "import2.1 worked"); - QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("works21.qml"))); - foreach (QDeclarativeError err, component.errors()) - qWarning() << err; - VERIFY_ERRORS(0); - QObject *object = component.create(); - QVERIFY(object != 0); - QCOMPARE(object->property("value").toInt(),123); - delete object; -} - -void tst_qdeclarativemoduleplugin::incorrectPluginCase() -{ - QDeclarativeEngine engine; - engine.addImportPath(m_importsDirectory); - - QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("incorrectCase.qml"))); - - QList<QDeclarativeError> errors = component.errors(); - QCOMPARE(errors.count(), 1); - -#if defined(Q_OS_MAC) || defined(Q_OS_WIN32) -#if defined(Q_OS_MAC) - QString libname = "libPluGin.dylib"; -#elif defined(Q_OS_WIN32) - QString libname = "PluGin.dll"; -#endif - QString expectedError = QLatin1String("plugin cannot be loaded for module \"com.nokia.WrongCase\": File name case mismatch for \"") + QDir(m_importsDirectory).filePath("com/nokia/WrongCase/" + libname) + QLatin1String("\""); -#else - QString expectedError = QLatin1String("module \"com.nokia.WrongCase\" plugin \"PluGin\" not found"); -#endif - - QCOMPARE(errors.at(0).description(), expectedError); -} - -void tst_qdeclarativemoduleplugin::importPluginWithQmlFile() -{ - QString path = m_importsDirectory; - - // QTBUG-16885: adding an import path with a lower-case "c:" causes assert failure - // (this only happens if the plugin includes pure QML files) - #ifdef Q_OS_WIN - QVERIFY(path.at(0).isUpper() && path.at(1) == QLatin1Char(':')); - path = path.at(0).toLower() + path.mid(1); - #endif - - QDeclarativeEngine engine; - engine.addImportPath(path); - - QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("pluginWithQmlFile.qml"))); - foreach (QDeclarativeError err, component.errors()) - qWarning() << err; - VERIFY_ERRORS(0); - QObject *object = component.create(); - QVERIFY(object != 0); - delete object; -} - -void tst_qdeclarativemoduleplugin::remoteImportWithQuotedUrl() -{ - TestHTTPServer server(SERVER_PORT); - QVERIFY(server.isValid()); - server.serveDirectory(m_importsDirectory); - - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine); - component.setData("import \"http://127.0.0.1:14450/com/nokia/PureQmlModule\" \nComponentA { width: 300; ComponentB{} }", QUrl()); - - QTRY_COMPARE(component.status(), QDeclarativeComponent::Ready); - QObject *object = component.create(); - QCOMPARE(object->property("width").toInt(), 300); - QVERIFY(object != 0); - delete object; - - foreach (QDeclarativeError err, component.errors()) - qWarning() << err; - VERIFY_ERRORS(0); -} - -void tst_qdeclarativemoduleplugin::remoteImportWithUnquotedUri() -{ - TestHTTPServer server(SERVER_PORT); - QVERIFY(server.isValid()); - server.serveDirectory(m_importsDirectory); - - QDeclarativeEngine engine; - engine.addImportPath(m_importsDirectory); - QDeclarativeComponent component(&engine); - component.setData("import com.nokia.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl()); - - - QTRY_COMPARE(component.status(), QDeclarativeComponent::Ready); - QObject *object = component.create(); - QVERIFY(object != 0); - QCOMPARE(object->property("width").toInt(), 300); - delete object; - - foreach (QDeclarativeError err, component.errors()) - qWarning() << err; - VERIFY_ERRORS(0); -} - -// QTBUG-17324 - -void tst_qdeclarativemoduleplugin::importsMixedQmlCppPlugin() -{ - QDeclarativeEngine engine; - engine.addImportPath(m_importsDirectory); - - { - QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("importsMixedQmlCppPlugin.qml"))); - - QObject *o = component.create(); - QVERIFY2(o != 0, QDeclarativeDataTest::msgComponentError(component, &engine)); - QCOMPARE(o->property("test").toBool(), true); - delete o; - } - - { - QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("importsMixedQmlCppPlugin.2.qml"))); - - QObject *o = component.create(); - QVERIFY2(o != 0, QDeclarativeDataTest::msgComponentError(component, &engine)); - QCOMPARE(o->property("test").toBool(), true); - QCOMPARE(o->property("test2").toBool(), true); - delete o; - } - - -} - -void tst_qdeclarativemoduleplugin::versionNotInstalled_data() -{ - QTest::addColumn<QString>("file"); - QTest::addColumn<QString>("errorFile"); - - QTest::newRow("versionNotInstalled") << "versionNotInstalled.qml" << "versionNotInstalled.errors.txt"; - QTest::newRow("versionNotInstalled") << "versionNotInstalled.2.qml" << "versionNotInstalled.2.errors.txt"; -} - -void tst_qdeclarativemoduleplugin::versionNotInstalled() -{ - QFETCH(QString, file); - QFETCH(QString, errorFile); - - QDeclarativeEngine engine; - engine.addImportPath(m_importsDirectory); - - QDeclarativeComponent component(&engine, testFileUrl(file)); - VERIFY_ERRORS(errorFile.toLatin1().constData()); -} - - -// test that errors are reporting correctly for plugin loading and qmldir parsing -void tst_qdeclarativemoduleplugin::implicitQmldir_data() -{ - QTest::addColumn<QString>("directory"); - QTest::addColumn<QString>("file"); - QTest::addColumn<QString>("errorFile"); - - // parsing qmldir succeeds, but plugin specified in the qmldir file doesn't exist - QTest::newRow("implicitQmldir") << "implicit1" << "temptest.qml" << "implicitQmldir.errors.txt"; - - // parsing qmldir fails due to syntax errors, etc. - QTest::newRow("implicitQmldir2") << "implicit2" << "temptest2.qml" << "implicitQmldir.2.errors.txt"; -} -void tst_qdeclarativemoduleplugin::implicitQmldir() -{ - QFETCH(QString, directory); - QFETCH(QString, file); - QFETCH(QString, errorFile); - - QString importPath = testFile(directory); - QString fileName = directory + QDir::separator() + file; - QString errorFileName = directory + QDir::separator() + errorFile; - QUrl testUrl = testFileUrl(fileName); - - QDeclarativeEngine engine; - engine.addImportPath(importPath); - - QDeclarativeComponent component(&engine, testUrl); - QList<QDeclarativeError> errors = component.errors(); - VERIFY_ERRORS(errorFileName.toLatin1().constData()); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); - QObject *obj = component.create(); - QVERIFY(!obj); - delete obj; -} - - -QTEST_MAIN(tst_qdeclarativemoduleplugin) - -#include "tst_qdeclarativemoduleplugin.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro deleted file mode 100644 index 58f329d095..0000000000 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ /dev/null @@ -1,19 +0,0 @@ -CONFIG += testcase -TARGET = tst_qdeclarativemoduleplugin - -HEADERS = ../../shared/testhttpserver.h -SOURCES = tst_qdeclarativemoduleplugin.cpp \ - ../../shared/testhttpserver.cpp -CONFIG -= app_bundle - -include (../../shared/util.pri) - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -testImportFiles.files = imports -testImportFiles.path = . -DEPLOYMENT += testImportFiles - -QT += core-private gui-private declarative-private network testlib |