Merge branch 'master' of git:qt/qt-qml

Conflicts:
	src/declarative/graphicsitems/qdeclarativeparticles.cpp

1 files changed, 0 insertions, 207 deletions

diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp
deleted file mode 100644
index ae42b5b..0000000
--- a/src/declarative/debugger/qmldebugclient.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module 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 "qmldebugclient_p.h"
-
-#include "qpacketprotocol_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qstringlist.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlDebugConnectionPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    QmlDebugConnectionPrivate(QmlDebugConnection *c);
-    QmlDebugConnection *q;
-    QPacketProtocol *protocol;
-
-    QStringList enabled;
-    QHash<QString, QmlDebugClient *> plugins;
-public Q_SLOTS:
-    void connected();
-    void readyRead();
-};
-
-QmlDebugConnectionPrivate::QmlDebugConnectionPrivate(QmlDebugConnection *c)
-: QObject(c), q(c), protocol(0)
-{
-    protocol = new QPacketProtocol(q, this);
-    QObject::connect(c, SIGNAL(connected()), this, SLOT(connected()));
-    QObject::connect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
-}
-
-void QmlDebugConnectionPrivate::connected()
-{
-    QPacket pack;
-    pack << QString(QLatin1String("QmlDebugServer")) << enabled;
-    protocol->send(pack);
-}
-
-void QmlDebugConnectionPrivate::readyRead()
-{
-    QPacket pack = protocol->read();
-    QString name; QByteArray message;
-    pack >> name >> message;
-
-    QHash<QString, QmlDebugClient *>::Iterator iter = 
-        plugins.find(name);
-    if (iter == plugins.end()) {
-        qWarning() << "QmlDebugConnection: Message received for missing plugin" << name;
-    } else {
-        (*iter)->messageReceived(message);
-    }
-}
-
-QmlDebugConnection::QmlDebugConnection(QObject *parent)
-: QTcpSocket(parent), d(new QmlDebugConnectionPrivate(this))
-{
-}
-
-bool QmlDebugConnection::isConnected() const
-{
-    return state() == ConnectedState;
-}
-
-class QmlDebugClientPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlDebugClient)
-public:
-    QmlDebugClientPrivate();
-
-    QString name;
-    QmlDebugConnection *client;
-    bool enabled;
-};
-
-QmlDebugClientPrivate::QmlDebugClientPrivate()
-: client(0), enabled(false)
-{
-}
-
-QmlDebugClient::QmlDebugClient(const QString &name, 
-                                           QmlDebugConnection *parent)
-: QObject(*(new QmlDebugClientPrivate), parent)
-{
-    Q_D(QmlDebugClient);
-    d->name = name;
-    d->client = parent;
-
-    if (!d->client)
-        return;
-
-    if (d->client->d->plugins.contains(name)) {
-        qWarning() << "QmlDebugClient: Conflicting plugin name" << name;
-        d->client = 0;
-    } else {
-        d->client->d->plugins.insert(name, this);
-    }
-}
-
-QString QmlDebugClient::name() const
-{
-    Q_D(const QmlDebugClient);
-    return d->name;
-}
-
-bool QmlDebugClient::isEnabled() const
-{
-    Q_D(const QmlDebugClient);
-    return d->enabled;
-}
-
-void QmlDebugClient::setEnabled(bool e)
-{
-    Q_D(QmlDebugClient);
-    if (e == d->enabled)
-        return;
-
-    d->enabled = e;
-
-    if (d->client) {
-        if (e) 
-            d->client->d->enabled.append(d->name);
-        else
-            d->client->d->enabled.removeAll(d->name);
-
-        if (d->client->state() == QTcpSocket::ConnectedState) {
-            QPacket pack;
-            pack << QString(QLatin1String("QmlDebugServer"));
-            if (e) pack << (int)1;
-            else pack << (int)2;
-            pack << d->name;
-            d->client->d->protocol->send(pack);
-        }
-    }
-}
-
-bool QmlDebugClient::isConnected() const
-{
-    Q_D(const QmlDebugClient);
-
-    if (!d->client)
-        return false;
-    return d->client->isConnected();
-}
-
-void QmlDebugClient::sendMessage(const QByteArray &message)
-{
-    Q_D(QmlDebugClient);
-
-    if (!d->client || !d->client->isConnected())
-        return;
-
-    QPacket pack;
-    pack << d->name << message;
-    d->client->d->protocol->send(pack);
-}
-
-void QmlDebugClient::messageReceived(const QByteArray &)
-{
-}
-
-QT_END_NAMESPACE
-
-#include <qmldebugclient.moc>