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

Conflicts:
	src/declarative/qml/qmlvme.cpp

3 files changed, 2 insertions, 87 deletions

diff --git a/examples/declarative/loader/loader.pro b/examples/declarative/loader/loader.pro
index edd6267..84b2d21 100644
--- a/examples/declarative/loader/loader.pro
+++ b/examples/declarative/loader/loader.pro
@@ -1,5 +1,5 @@
 SOURCES = main.cpp qmlfolderlistmodel.cpp
-HEADERS = qmlfolderlistmodel.h qlistmodelinterface.h
+HEADERS = qmlfolderlistmodel.h
 RESOURCES = loader.qrc
 
 QT += script declarative network
diff --git a/examples/declarative/loader/qlistmodelinterface.h b/examples/declarative/loader/qlistmodelinterface.h
deleted file mode 100644
index 738378e..0000000
--- a/examples/declarative/loader/qlistmodelinterface.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QLISTMODELINTERFACE_H
-#define QLISTMODELINTERFACE_H
-
-#include <QtCore/QHash>
-#include <QtCore/QVariant>
-
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject
-{
-    Q_OBJECT
- public:
-    QListModelInterface(QObject *parent = 0) : QObject(parent) {}
-    virtual ~QListModelInterface() {}
-
-    virtual int count() const = 0;
-    virtual QHash<int,QVariant> data(int index, const QList<int>& roles = QList<int>()) const = 0;
-    virtual bool setData(int index, const QHash<int,QVariant>& values)
-    { Q_UNUSED(index); Q_UNUSED(values); return false; }
-
-    virtual QList<int> roles() const = 0;
-    virtual QString toString(int role) const = 0;
-
- Q_SIGNALS:
-    void itemsInserted(int index, int count);
-    void itemsRemoved(int index, int count);
-    void itemsMoved(int from, int to, int count);
-    void itemsChanged(int index, int count, const QList<int> &roles);
-
- protected:
-    QListModelInterface(QObjectPrivate &dd, QObject *parent) 
-        : QObject(dd, parent) {}
-};
-
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-#endif //QTREEMODELINTERFACE_H
diff --git a/examples/declarative/loader/qmlfolderlistmodel.h b/examples/declarative/loader/qmlfolderlistmodel.h
index f50719a..ac9568f 100644
--- a/examples/declarative/loader/qmlfolderlistmodel.h
+++ b/examples/declarative/loader/qmlfolderlistmodel.h
@@ -43,7 +43,7 @@
 #define QMLFOLDERLISTMODEL_H
 
 #include <qml.h>
-#include "qlistmodelinterface.h"
+#include "../../../src/declarative/3rdparty/qlistmodelinterface_p.h"
 
 class QmlContext;
 class QModelIndex;