Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits)
  Fix test.
  Remove hacky fix (breaks autotest).
  Fix Behaviors for object-type properties.
  Pass symbols::prefix (Action -> QmlAction)
  Add license header.
  Fix bad merge (compile)
  Pass tst_headers::licenseCheck
  Fix ListView tests.
  Test fixes.
  More test fixes.
  Clean up QmlImageReader thread on engine destruction.
  Update test to handle QmlNetworkAccessManagerFactory
  Test fixes.
  Add a QEXPECT_FAIL for known bug.
  Fix autotest.
  Add some painting benchmarks.
  Make sure cookies are saved.
  Fix headers::licenseCheck autotest failure
  Re-add accidentally deleted file
  Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
  ...

1 files changed, 100 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h
new file mode 100644
index 0000000..971fc89
--- /dev/null
+++ b/src/declarative/qml/qmlboundsignal_p.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** 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 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$
+**
+****************************************************************************/
+
+#ifndef QMLBOUNDSIGNAL_P_H
+#define QMLBOUNDSIGNAL_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 "qmlexpression.h"
+
+#include <QtCore/qmetaobject.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QmlAbstractBoundSignal : public QObject
+{
+    Q_OBJECT
+public:
+    QmlAbstractBoundSignal(QObject *parent = 0);
+    virtual ~QmlAbstractBoundSignal() = 0;
+};
+
+class QmlBoundSignalParameters;
+class QmlBoundSignal : public QmlAbstractBoundSignal
+{
+public:
+    QmlBoundSignal(QObject *scope, const QMetaMethod &signal, QObject *parent);
+    QmlBoundSignal(QmlContext *ctxt, const QString &val, QObject *scope, 
+                   const QMetaMethod &signal, QObject *parent);
+    virtual ~QmlBoundSignal();
+
+    int index() const;
+
+    QmlExpression *expression() const;
+    QmlExpression *setExpression(QmlExpression *);
+
+    static QmlBoundSignal *cast(QObject *);
+
+protected:
+    virtual int qt_metacall(QMetaObject::Call c, int id, void **a);
+
+private:
+    QmlExpression *m_expression;
+    QMetaMethod m_signal;
+    bool m_paramsValid;
+    QmlBoundSignalParameters *m_params;
+};
+
+QT_END_NAMESPACE
+
+#endif // QMLBOUNDSIGNAL_P_H