diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 05:53:25 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-02 05:53:25 (GMT) |
| commit | 5531b8cc935b70771bcf62472d92ff4b3887e3bd (patch) | |
| tree | cb1a0831054ef3c606adc5ff569f9673e85d7a98 /src/declarative/qml/qmlengine_p.h | |
| parent | 9317724be9d588ba8616e3cbf6300f9c32a64ede (diff) | |
| parent | b6e26ee808ae3ffe1c4fba03cc89baf47d65d3a8 (diff) | |
| download | Qt-5531b8cc935b70771bcf62472d92ff4b3887e3bd.zip Qt-5531b8cc935b70771bcf62472d92ff4b3887e3bd.tar.gz Qt-5531b8cc935b70771bcf62472d92ff4b3887e3bd.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
Conflicts:
demos/declarative/samegame/content/samegame.js
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 2c7409b..451276d 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -240,6 +240,10 @@ public: static QScriptValue size(QScriptContext*, QScriptEngine*); static QScriptValue rect(QScriptContext*, QScriptEngine*); + static QScriptValue lighter(QScriptContext*, QScriptEngine*); + static QScriptValue darker(QScriptContext*, QScriptEngine*); + static QScriptValue tint(QScriptContext*, QScriptEngine*); + static QScriptEngine *getScriptEngine(QmlEngine *e) { return &e->d_func()->scriptEngine; } static QmlEngine *getEngine(QScriptEngine *e) { return static_cast<QmlScriptEngine*>(e)->p->q_func(); } static QmlEnginePrivate *get(QmlEngine *e) { return e->d_func(); } |