diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-30 07:21:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-30 07:21:31 (GMT) |
| commit | d8683cd18c852569672e43237c06dc619f193eba (patch) | |
| tree | 32dfe36ba1d99aa2817dc3bdb91f0ec01b1d4c67 /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | 85db980578cb9f1b95be160a4386d9822c6ec6d0 (diff) | |
| parent | 5d34515465d143d08d198b799489f472741a340f (diff) | |
| download | Qt-d8683cd18c852569672e43237c06dc619f193eba.zip Qt-d8683cd18c852569672e43237c06dc619f193eba.tar.gz Qt-d8683cd18c852569672e43237c06dc619f193eba.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 45656e8..531ac97 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -294,6 +294,7 @@ public: static QScriptValue tint(QScriptContext*, QScriptEngine*); static QScriptValue desktopOpenUrl(QScriptContext*, QScriptEngine*); + static QScriptValue fontFamilies(QScriptContext*, QScriptEngine*); static QScriptValue md5(QScriptContext*, QScriptEngine*); static QScriptValue btoa(QScriptContext*, QScriptEngine*); static QScriptValue atob(QScriptContext*, QScriptEngine*); |