Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

9 files changed, 221 insertions, 9 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 19a20e8..5479463 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1197,13 +1197,12 @@ public:
             if (!found) {
                 // XXX assume it is a built-in type qualifier
                 isbuiltin = true;
-            } else {
-                QFactoryLoader *l = loader();
-                QmlModuleFactoryInterface *factory =
-                    qobject_cast<QmlModuleFactoryInterface*>(l->instance(uri));
-                if (factory)
-                    isbuiltin = true;
             }
+            QFactoryLoader *l = loader();
+            QmlModuleFactoryInterface *factory =
+                qobject_cast<QmlModuleFactoryInterface*>(l->instance(uri));
+            if (factory)
+                isbuiltin = true;
         } else {
             url = base.resolved(QUrl(url)).toString();
         }
diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
index 51546e8..cbd1efe 100644
--- a/src/gui/text/qzipreader_p.h
+++ b/src/gui/text/qzipreader_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 class QZipReaderPrivate;
 
-class Q_AUTOTEST_EXPORT QZipReader
+class Q_GUI_EXPORT QZipReader
 {
 public:
     QZipReader(const QString &fileName, QIODevice::OpenMode mode = QIODevice::ReadOnly );
@@ -73,7 +73,7 @@ public:
     bool isReadable() const;
     bool exists() const;
 
-    struct Q_AUTOTEST_EXPORT FileInfo
+    struct Q_GUI_EXPORT FileInfo
     {
         FileInfo();
         FileInfo(const FileInfo &other);
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin.qml b/tests/auto/declarative/qmlmoduleplugin/plugin.qml
new file mode 100644
index 0000000..f29ae24
--- /dev/null
+++ b/tests/auto/declarative/qmlmoduleplugin/plugin.qml
@@ -0,0 +1,3 @@
+import com.nokia.AutoTestQmlPluginType 1.0
+
+MyPluginType { value: 123 }
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
new file mode 100644
index 0000000..a4e47f7
--- /dev/null
+++ b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtDeclarative/qmlmoduleplugin.h>
+#include <QtDeclarative/qml.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;
+};
+
+QML_DECLARE_TYPE(MyPluginType);
+QML_DEFINE_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
+
+
+class MyPlugin : public QmlModulePlugin
+{
+    Q_OBJECT
+public:
+    QStringList keys() const
+    {
+        return QStringList() << QLatin1String("com.nokia.AutoTestQmlPluginType");
+    }
+};
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(plugin, MyPlugin);
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro
new file mode 100644
index 0000000..0625ea3
--- /dev/null
+++ b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro
@@ -0,0 +1,5 @@
+TEMPLATE = lib
+CONFIG += plugin
+SOURCES = plugin.cpp
+QT = core declarative
+DESTDIR = qmlmodules
diff --git a/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro b/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro
new file mode 100644
index 0000000..c60743d
--- /dev/null
+++ b/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro
@@ -0,0 +1,7 @@
+QT = core
+TEMPLATE = subdirs
+SUBDIRS = plugin
+tst_qmlmoduleplugin_pro.depends += plugin
+SUBDIRS += tst_qmlmoduleplugin.pro
+
+
diff --git a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp b/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp
new file mode 100644
index 0000000..a212610
--- /dev/null
+++ b/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <qdir.h>
+#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qmlcomponent.h>
+#include <QDebug>
+
+class tst_qmlmoduleplugin : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlmoduleplugin() {
+        QCoreApplication::addLibraryPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin"));
+qDebug() << QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin");
+    }
+
+private slots:
+    void importsPlugin();
+};
+
+#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 { \
+        QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
+        QVERIFY(file.open(QIODevice::ReadOnly)); \
+        QByteArray data = file.readAll(); \
+        file.close(); \
+        QList<QByteArray> expected = data.split('\n'); \
+        expected.removeAll(QByteArray("")); \
+        QList<QmlError> errors = component.errors(); \
+        QList<QByteArray> actual; \
+        for (int ii = 0; ii < errors.count(); ++ii) { \
+            const QmlError &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("QMLLANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
+            QFile file(QLatin1String("data/") + QLatin1String(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); \
+        } \
+    }
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename));
+}
+
+
+void tst_qmlmoduleplugin::importsPlugin()
+{
+    QmlEngine engine;
+    QTest::ignoreMessage(QtWarningMsg, "import worked");
+    QmlComponent component(&engine, TEST_FILE("plugin.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("value").toInt(),123);
+}
+
+QTEST_MAIN(tst_qmlmoduleplugin)
+
+#include "tst_qmlmoduleplugin.moc"
diff --git a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro b/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro
new file mode 100644
index 0000000..3c8a568
--- /dev/null
+++ b/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES = tst_qmlmoduleplugin.cpp
+QT += declarative
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 4dee2ee..60208d2 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -298,7 +298,6 @@ public:
     QNetworkReply *createRequest (Operation op, const QNetworkRequest &req, QIODevice * outgoingData)
     {
         QNetworkRequest request = req;
-        request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
         request.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
         return QNetworkAccessManager::createRequest(op,request,outgoingData);
     }