diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-21 04:56:22 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-21 04:59:45 (GMT) |
| commit | 4ef2862b791c210a30586ba140cc6f508e06883f (patch) | |
| tree | 460a6da2ba2e74d15a0b3952bd9531772a2065ab /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | fe39717cea0a53180e0f9aa0c4755ac68ee1e44e (diff) | |
| download | Qt-4ef2862b791c210a30586ba140cc6f508e06883f.zip Qt-4ef2862b791c210a30586ba140cc6f508e06883f.tar.gz Qt-4ef2862b791c210a30586ba140cc6f508e06883f.tar.bz2 | |
Ensure QML Global Qt object functions appear in the documentation index
Also moves documentation of Qt global object to alongside code. Docs are slightly
misleading because they say "Qt::argb" etc. when "Qt.argb" would be clearer.
Downgrades QTBUG-7725 from P2 to P4 as remaining functions are standard webJS.
Task-number: QTBUG-7725
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 0b1c17d..411f780 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -283,7 +283,7 @@ public: static QScriptValue createComponent(QScriptContext*, QScriptEngine*); static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*); static QScriptValue isQtObject(QScriptContext*, QScriptEngine*); - static QScriptValue vector(QScriptContext*, QScriptEngine*); + static QScriptValue vector3d(QScriptContext*, QScriptEngine*); static QScriptValue rgba(QScriptContext*, QScriptEngine*); static QScriptValue hsla(QScriptContext*, QScriptEngine*); static QScriptValue point(QScriptContext*, QScriptEngine*); |