diff options
| author | Christopher Ham <christopher.ham@nokia.com> | 2011-01-27 06:49:21 (GMT) |
|---|---|---|
| committer | Christopher Ham <christopher.ham@nokia.com> | 2011-01-27 06:49:21 (GMT) |
| commit | ed742d3c46eca7584b6fcb20c2de941852613fb2 (patch) | |
| tree | 2576788be9f837373b00380f8dd12589d97ac259 /src/declarative | |
| parent | aa40f956bab22678b62f630af97f51f9e8fab9f8 (diff) | |
| download | Qt-ed742d3c46eca7584b6fcb20c2de941852613fb2.zip Qt-ed742d3c46eca7584b6fcb20c2de941852613fb2.tar.gz Qt-ed742d3c46eca7584b6fcb20c2de941852613fb2.tar.bz2 | |
Apply property bindings during component creation. Add versioning
Versioning for QtQuick 1.1 was added for invokable method in
component. Full changes are in:
aa40f956bab22678b62f630af97f51f9e8fab9f8
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index 3d318c3..9a60a8b 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -110,7 +110,7 @@ Q_SIGNALS: protected: QDeclarativeComponent(QDeclarativeComponentPrivate &dd, QObject* parent); Q_INVOKABLE QScriptValue createObject(QObject* parent); - Q_INVOKABLE QScriptValue createObject(QObject* parent, const QScriptValue& valuemap); //XXX Versioning + Q_INVOKABLE Q_REVISION(1) QScriptValue createObject(QObject* parent, const QScriptValue& valuemap); //XXX Versioning private: QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, int, QObject *parent); |