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

1 files changed, 0 insertions, 98 deletions

diff --git a/src/declarative/qml/qmlcomponentjs_p.h b/src/declarative/qml/qmlcomponentjs_p.h
deleted file mode 100644
index 3213929..0000000
--- a/src/declarative/qml/qmlcomponentjs_p.h
+++ /dev/null
@@ -1,98 +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 QMLCOMPONENTJS_P_H
-#define QMLCOMPONENTJS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
-#include <QtDeclarative/qfxglobal.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlerror.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlComponentJSPrivate;
-class QmlEngine;
-class QmlContext;
-class Q_DECLARATIVE_EXPORT QmlComponentJS : public QmlComponent
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlComponentJS)
-    Q_PROPERTY(bool isNull READ isNull NOTIFY isNullChanged)
-    Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged)
-    Q_PROPERTY(bool isError READ isError NOTIFY isErrorChanged)
-    Q_PROPERTY(bool isLoading READ isLoading NOTIFY isLoadingChanged)
-    friend class QmlEngine;
-public:
-    QmlComponentJS(QmlEngine *, const QUrl &url, QObject *parent = 0);
-    QmlComponentJS(QmlEngine *, QObject *parent=0);
-
-    Q_INVOKABLE QScriptValue createObject();
-    Q_INVOKABLE QString errorsString() const;
-
-    void setContext(QmlContext* c);
-Q_SIGNALS:
-    void isNullChanged();
-    void isErrorChanged();
-    void isReadyChanged();
-    void isLoadingChanged();
-private Q_SLOTS:
-    void statusChange(QmlComponent::Status newStatus);
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlComponentJS)
-
-#endif // QMLCOMPONENTJS_P_H