summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptvalue.cpp
diff options
context:
space:
mode:
authorJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-19 14:26:58 (GMT)
committerJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-19 14:26:58 (GMT)
commit7ae701ff4759bdfd12953c6f4d785c2d9241690f (patch)
tree7788e1119d5f5b3e620eb1b8e2a793ee6c828c8e /src/script/api/qscriptvalue.cpp
parentbbf514474b2664779229b919b54b4c541157c1d3 (diff)
downloadQt-7ae701ff4759bdfd12953c6f4d785c2d9241690f.zip
Qt-7ae701ff4759bdfd12953c6f4d785c2d9241690f.tar.gz
Qt-7ae701ff4759bdfd12953c6f4d785c2d9241690f.tar.bz2
Fix QScriptValue::objectId().
QScriptValue id were made persistent. It depands on JSC:JSValue JSCell pointer not on QScriptValuePrivate attr. Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
-rw-r--r--src/script/api/qscriptvalue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 7021cbc..edcb6ac 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -275,7 +275,7 @@ qsreal ToInteger(qsreal n)
} // namespace QScript
-QScriptValuePrivate::QScriptValuePrivate() : engine(this), valid(true), id(-1)
+QScriptValuePrivate::QScriptValuePrivate() : engine(this), valid(true)
{
ref = 0;
}
@@ -2547,6 +2547,6 @@ void QScriptValue::setScriptClass(QScriptClass *scriptClass)
*/
qint64 QScriptValue::objectId() const
{
- return d_ptr?d_ptr->id:-1;
+ return d_ptr?d_ptr->objectId():-1;
}
QT_END_NAMESPACE