equal
deleted
inserted
replaced
1146 "a different engine"); |
1146 "a different engine"); |
1147 return false; |
1147 return false; |
1148 } |
1148 } |
1149 |
1149 |
1150 if (d->type != other.d_ptr->type) { |
1150 if (d->type != other.d_ptr->type) { |
1151 if (d->type == QScriptValuePrivate::JavaScriptCore) |
1151 if (d->type == QScriptValuePrivate::JavaScriptCore) { |
1152 return JSC::JSValue::strictEqual(d->jscValue, d->engine->scriptValueToJSCValue(other)); |
1152 QScriptEnginePrivate *eng_p = d->engine ? d->engine : other.d_ptr->engine; |
1153 else if (other.d_ptr->type == QScriptValuePrivate::JavaScriptCore) |
1153 if (eng_p) |
1154 return JSC::JSValue::strictEqual(other.d_ptr->engine->scriptValueToJSCValue(*this), other.d_ptr->jscValue); |
1154 return JSC::JSValue::strictEqual(d->jscValue, eng_p->scriptValueToJSCValue(other)); |
|
1155 } else if (other.d_ptr->type == QScriptValuePrivate::JavaScriptCore) { |
|
1156 QScriptEnginePrivate *eng_p = other.d_ptr->engine ? other.d_ptr->engine : d->engine; |
|
1157 if (eng_p) |
|
1158 return JSC::JSValue::strictEqual(eng_p->scriptValueToJSCValue(*this), other.d_ptr->jscValue); |
|
1159 } |
1155 |
1160 |
1156 return false; |
1161 return false; |
1157 } |
1162 } |
1158 switch (d->type) { |
1163 switch (d->type) { |
1159 case QScriptValuePrivate::JavaScriptCore: |
1164 case QScriptValuePrivate::JavaScriptCore: |