diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-27 13:13:33 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-27 13:13:33 (GMT) |
| commit | 919259cadd1adc18aaaef7e6f453e3fa005dd8b7 (patch) | |
| tree | 4985e8f6b54dcf7bebf73c83cd955ec797784897 /src/script/api/qscriptengine.cpp | |
| parent | bb76203895a8a33bc76a4e4662492d1100c8b4fd (diff) | |
| parent | 29488d2315c594a273da6b7adb8d238aeca23083 (diff) | |
| download | Qt-919259cadd1adc18aaaef7e6f453e3fa005dd8b7.zip Qt-919259cadd1adc18aaaef7e6f453e3fa005dd8b7.tar.gz Qt-919259cadd1adc18aaaef7e6f453e3fa005dd8b7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index c14e38a..596fd8f 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -468,7 +468,7 @@ bool isFunction(JSC::JSValue value) static JSC::JSValue JSC_HOST_CALL functionConnect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); static JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState *exec, JSC::JSObject */*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args) +JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState *exec, JSC::JSObject * /*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args) { #ifndef QT_NO_QOBJECT if (args.size() == 0) { @@ -533,7 +533,7 @@ JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState *exec, JSC::JSObjec #endif // QT_NO_QOBJECT } -JSC::JSValue JSC_HOST_CALL functionConnect(JSC::ExecState *exec, JSC::JSObject */*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args) +JSC::JSValue JSC_HOST_CALL functionConnect(JSC::ExecState *exec, JSC::JSObject * /*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args) { #ifndef QT_NO_QOBJECT if (args.size() == 0) { |