From 47857453767a0ec2c7b75a555658dd166bd7d3d4 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Tue, 27 Jul 2010 10:23:46 +0200
Subject: QScriptValue::objectId(): do not assert if the value is not a cell
JSC::JSValue::asCell asserts if it is not a cell
Reviewed-by: Jedrzej Nowacki
---
src/script/api/qscriptvalue_p.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 853c6c8..8f286db 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -103,7 +103,7 @@ public:
qint64 objectId()
{
- if ( (type == JavaScriptCore) && (engine) )
+ if ( (type == JavaScriptCore) && (engine) && jscValue.isCell() )
return (qint64)jscValue.asCell();
else
return -1;
--
cgit v0.12