Say hello to QtQuick module

This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.

99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.

The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.

All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.

A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.

The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)

There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.

In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.

Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

3 files changed, 502 insertions, 0 deletions

diff --git a/tests/auto/shared/testhttpserver.cpp b/tests/auto/shared/testhttpserver.cpp
new file mode 100644
index 0000000000..206094924c
--- /dev/null
+++ b/tests/auto/shared/testhttpserver.cpp
@@ -0,0 +1,324 @@
+/****************************************************************************
+**
+** 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 "testhttpserver.h"
+#include <QTcpSocket>
+#include <QDebug>
+#include <QFile>
+#include <QTimer>
+
+/*!
+\internal
+\class TestHTTPServer
+\brief provides a very, very basic HTTP server for testing.
+
+Inside the test case, an instance of TestHTTPServer should be created, with the
+appropriate port to listen on.  The server will listen on the localhost interface.
+
+Directories to serve can then be added to server, which will be added as "roots".
+Each root can be added as a Normal, Delay or Disconnect root.  Requests for files
+within a Normal root are returned immediately.  Request for files within a Delay
+root are delayed for 500ms, and then served.  Requests for files within a Disconnect
+directory cause the server to disconnect immediately.  A request for a file that isn't
+found in any root will return a 404 error.
+
+If you have the following directory structure:
+
+\code
+disconnect/disconnectTest.qml
+files/main.qml
+files/Button.qml
+files/content/WebView.qml
+slowFiles/slowMain.qml
+\endcode
+it can be added like this:
+\code
+TestHTTPServer server(14445);
+server.serveDirectory("disconnect", TestHTTPServer::Disconnect);
+server.serveDirectory("files");
+server.serveDirectory("slowFiles", TestHTTPServer::Delay);
+\endcode
+
+The following request urls will then result in the appropriate action:
+\table
+\header \o URL \o Action
+\row \o http://localhost:14445/disconnectTest.qml \o Disconnection
+\row \o http://localhost:14445/main.qml \o main.qml returned immediately
+\row \o http://localhost:14445/Button.qml \o Button.qml returned immediately
+\row \o http://localhost:14445/content/WebView.qml \o content/WebView.qml returned immediately
+\row \o http://localhost:14445/slowMain.qml \o slowMain.qml returned after 500ms
+\endtable
+*/
+TestHTTPServer::TestHTTPServer(quint16 port)
+: m_hasFailed(false)
+{
+    QObject::connect(&server, SIGNAL(newConnection()), this, SLOT(newConnection()));
+
+    server.listen(QHostAddress::LocalHost, port);
+}
+
+bool TestHTTPServer::isValid() const
+{
+    return server.isListening();
+}
+
+bool TestHTTPServer::serveDirectory(const QString &dir, Mode mode)
+{
+    dirs.append(qMakePair(dir, mode));
+    return true;
+}
+
+/*
+   Add an alias, so that if filename is requested and does not exist,
+   alias may be returned.
+*/
+void TestHTTPServer::addAlias(const QString &filename, const QString &alias)
+{
+    aliases.insert(filename, alias);
+}
+
+void TestHTTPServer::addRedirect(const QString &filename, const QString &redirectName)
+{
+    redirects.insert(filename, redirectName);
+}
+
+bool TestHTTPServer::wait(const QUrl &expect, const QUrl &reply, const QUrl &body)
+{
+    m_hasFailed = false;
+
+    QFile expectFile(expect.toLocalFile());
+    if (!expectFile.open(QIODevice::ReadOnly)) return false;
+    
+    QFile replyFile(reply.toLocalFile());
+    if (!replyFile.open(QIODevice::ReadOnly)) return false;
+
+    bodyData = QByteArray();
+    if (body.isValid()) {
+        QFile bodyFile(body.toLocalFile());
+        if (!bodyFile.open(QIODevice::ReadOnly)) return false;
+        bodyData = bodyFile.readAll();
+    }
+
+    waitData = expectFile.readAll();
+    /*
+    while (waitData.endsWith('\n'))
+        waitData = waitData.left(waitData.count() - 1);
+        */
+
+    replyData = replyFile.readAll();
+
+    if (!replyData.endsWith('\n'))
+        replyData.append("\n");
+    replyData.append("Content-length: " + QByteArray::number(bodyData.length()));
+    replyData .append("\n\n");
+
+    for (int ii = 0; ii < replyData.count(); ++ii) {
+        if (replyData.at(ii) == '\n' && (!ii || replyData.at(ii - 1) != '\r')) {
+            replyData.insert(ii, '\r');
+            ++ii;
+        }
+    }
+    replyData.append(bodyData);
+
+    return true;
+}
+
+bool TestHTTPServer::hasFailed() const
+{
+    return m_hasFailed;
+}
+
+void TestHTTPServer::newConnection()
+{
+    QTcpSocket *socket = server.nextPendingConnection();
+    if (!socket) return;
+
+    if (!dirs.isEmpty())
+        dataCache.insert(socket, QByteArray());
+
+    QObject::connect(socket, SIGNAL(disconnected()), this, SLOT(disconnected()));
+    QObject::connect(socket, SIGNAL(readyRead()), this, SLOT(readyRead()));
+}
+
+void TestHTTPServer::disconnected()
+{
+    QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
+    if (!socket) return;
+
+    dataCache.remove(socket);
+    for (int ii = 0; ii < toSend.count(); ++ii) {
+        if (toSend.at(ii).first == socket) {
+            toSend.removeAt(ii);
+            --ii;
+        }
+    }
+    socket->disconnect();
+    socket->deleteLater();
+}
+
+void TestHTTPServer::readyRead()
+{
+    QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
+    if (!socket || socket->state() == QTcpSocket::ClosingState) return;
+
+    QByteArray ba = socket->readAll();
+
+    if (!dirs.isEmpty()) {
+        serveGET(socket, ba);
+        return;
+    }
+
+    if (m_hasFailed || waitData.isEmpty()) {
+        qWarning() << "TestHTTPServer: Unexpected data" << ba;
+        return;
+    }
+
+    for (int ii = 0; ii < ba.count(); ++ii) {
+        const char c = ba.at(ii);
+        if (c == '\r' && waitData.isEmpty())
+           continue;
+        else if (!waitData.isEmpty() && c == waitData.at(0))
+            waitData = waitData.mid(1);
+        else if (c == '\r')
+            continue;
+        else {
+            QByteArray data = ba.mid(ii);
+            qWarning() << "TestHTTPServer: Unexpected data" << data << "\nExpected: " << waitData;
+            m_hasFailed = true;
+            socket->disconnectFromHost();
+            return;
+        }
+    }
+
+    if (waitData.isEmpty()) {
+        socket->write(replyData);
+        socket->disconnectFromHost();
+    }
+}
+
+bool TestHTTPServer::reply(QTcpSocket *socket, const QByteArray &fileName)
+{
+    if (redirects.contains(fileName)) {
+        QByteArray response = "HTTP/1.1 302 Found\r\nContent-length: 0\r\nContent-type: text/html; charset=UTF-8\r\nLocation: " + redirects[fileName].toUtf8() + "\r\n\r\n";
+        socket->write(response);
+        return true;
+    }
+
+    for (int ii = 0; ii < dirs.count(); ++ii) {
+        QString dir = dirs.at(ii).first;
+        Mode mode = dirs.at(ii).second;
+
+        QString dirFile = dir + QLatin1String("/") + QLatin1String(fileName);
+
+        if (!QFile::exists(dirFile)) {
+            if (aliases.contains(fileName))
+                dirFile = dir + QLatin1String("/") + aliases.value(fileName);
+        }
+
+        QFile file(dirFile);
+        if (file.open(QIODevice::ReadOnly)) {
+
+            if (mode == Disconnect)
+                return true;
+
+            QByteArray data = file.readAll();
+
+            QByteArray response = "HTTP/1.0 200 OK\r\nContent-type: text/html; charset=UTF-8\r\nContent-length: ";
+            response += QByteArray::number(data.count());
+            response += "\r\n\r\n";
+            response += data;
+
+            if (mode == Delay) {
+                toSend.append(qMakePair(socket, response));
+                QTimer::singleShot(500, this, SLOT(sendOne()));
+                return false;
+            } else {
+                socket->write(response);
+                return true;
+            }
+        }
+    }
+
+
+    QByteArray response = "HTTP/1.0 404 Not found\r\nContent-type: text/html; charset=UTF-8\r\n\r\n";
+    socket->write(response);
+
+    return true;
+}
+
+void TestHTTPServer::sendOne()
+{
+    if (!toSend.isEmpty()) {
+        toSend.first().first->write(toSend.first().second);
+        toSend.first().first->close();
+        toSend.removeFirst();
+    }
+}
+
+void TestHTTPServer::serveGET(QTcpSocket *socket, const QByteArray &data)
+{
+    if (!dataCache.contains(socket))
+        return;
+
+    QByteArray total = dataCache[socket] + data;
+    dataCache[socket] = total;
+    
+    if (total.contains("\n\r\n")) {
+
+        bool close = true;
+
+        if (total.startsWith("GET /")) {
+
+            int space = total.indexOf(' ', 4);
+            if (space != -1) {
+
+                QByteArray req = total.mid(5, space - 5);
+                close = reply(socket, req);
+
+            }
+        }
+        dataCache.remove(socket);
+
+        if (close) 
+            socket->disconnectFromHost();
+    }
+}
+
diff --git a/tests/auto/shared/testhttpserver.h b/tests/auto/shared/testhttpserver.h
new file mode 100644
index 0000000000..3e8f70fea4
--- /dev/null
+++ b/tests/auto/shared/testhttpserver.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef TESTHTTPSERVER_H
+#define TESTHTTPSERVER_H
+
+#include <QObject>
+#include <QTcpServer>
+#include <QUrl>
+#include <QPair>
+
+class TestHTTPServer : public QObject
+{
+    Q_OBJECT
+public:
+    TestHTTPServer(quint16 port);
+
+    bool isValid() const;
+
+    enum Mode { Normal, Delay, Disconnect };
+    bool serveDirectory(const QString &, Mode = Normal);
+
+    bool wait(const QUrl &expect, const QUrl &reply, const QUrl &body);
+    bool hasFailed() const;
+
+    void addAlias(const QString &filename, const QString &aliasName);
+    void addRedirect(const QString &filename, const QString &redirectName);
+
+private slots:
+    void newConnection();
+    void disconnected();
+    void readyRead();
+    void sendOne();
+
+private:
+    void serveGET(QTcpSocket *, const QByteArray &);
+    bool reply(QTcpSocket *, const QByteArray &);
+
+    QList<QPair<QString, Mode> > dirs;
+    QHash<QTcpSocket *, QByteArray> dataCache;
+    QList<QPair<QTcpSocket *, QByteArray> > toSend;
+
+    QByteArray waitData;
+    QByteArray replyData;
+    QByteArray bodyData;
+    bool m_hasFailed;
+
+    QHash<QString,QString> aliases;
+    QHash<QString,QString> redirects;
+
+    QTcpServer server;
+};
+
+#endif // TESTHTTPSERVER_H
+
diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h
new file mode 100644
index 0000000000..eac2c4ec12
--- /dev/null
+++ b/tests/auto/shared/util.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETESTUTILS_H
+#define QDECLARATIVETESTUTILS_H
+
+#include <QtCore/qdir.h>
+#include <QtCore/qcoreapplication.h>
+
+namespace QDeclarativeTestUtils
+{
+    /*
+        Returns the path to some testdata file.
+
+        We first check relative to the binary, and then look in the source tree.
+
+        Note we are looking for a _directory_ which exists, but the _file_ itself need not exist,
+        to support the case of finding a path to a testdata file which doesn't exist yet (i.e.
+        a file we are about to create).
+    */
+    QString testdata(QString const& name, const char *sourceFile)
+    {
+        // Try to find it relative to the binary.
+        QFileInfo relative = QDir(QCoreApplication::applicationDirPath()).filePath(QLatin1String("data/") + name);
+        if (relative.dir().exists()) {
+            return relative.absoluteFilePath();
+        }
+
+        // Else try to find it in the source tree
+        QFileInfo from_source = QFileInfo(sourceFile).absoluteDir().filePath(QLatin1String("data/") + name);
+        if (from_source.dir().exists()) {
+            return from_source.absoluteFilePath();
+        }
+
+        qWarning("requested testdata %s could not be found (looked at: %s, %s)",
+                 qPrintable(name),
+                 qPrintable(relative.filePath()),
+                 qPrintable(from_source.filePath())
+                 );
+
+        return QString();
+    }
+}
+
+#define TESTDATA(name) QDeclarativeTestUtils::testdata(name, __FILE__)
+
+#endif // QDECLARATIVETESTUTILS_H