diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-01 01:41:07 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-01 01:41:07 (GMT) |
| commit | 7e85c6dc7ba0aaa6dfcad40dc0e9df0e2adb3741 (patch) | |
| tree | 07e839b8dd88c381471b96917ef5aafa484233b1 /src/script/bridge/qscriptdeclarativeclass_p.h | |
| parent | 6e8feab83fa9303b1345f4a27478ba3ee0316e86 (diff) | |
| parent | 5cf8677758e6fbfa5bf360c73519c14630db808c (diff) | |
| download | Qt-7e85c6dc7ba0aaa6dfcad40dc0e9df0e2adb3741.zip Qt-7e85c6dc7ba0aaa6dfcad40dc0e9df0e2adb3741.tar.gz Qt-7e85c6dc7ba0aaa6dfcad40dc0e9df0e2adb3741.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/util/qmlpixmapcache.cpp
Diffstat (limited to 'src/script/bridge/qscriptdeclarativeclass_p.h')
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h index 6050971..357d1d5 100644 --- a/src/script/bridge/qscriptdeclarativeclass_p.h +++ b/src/script/bridge/qscriptdeclarativeclass_p.h @@ -52,7 +52,6 @@ public: public: Value(); Value(const Value &); - Value(const QScriptValue &); Value(QScriptContext *, int); Value(QScriptContext *, uint); @@ -60,12 +59,14 @@ public: Value(QScriptContext *, double); Value(QScriptContext *, float); Value(QScriptContext *, const QString &); + Value(QScriptContext *, const QScriptValue &); Value(QScriptEngine *, int); Value(QScriptEngine *, uint); Value(QScriptEngine *, bool); Value(QScriptEngine *, double); Value(QScriptEngine *, float); Value(QScriptEngine *, const QString &); + Value(QScriptEngine *, const QScriptValue &); ~Value(); QScriptValue toScriptValue(QScriptEngine *) const; |