Changeset 54580 in webkit
- Timestamp:
- Feb 9, 2010 6:53:05 PM (14 years ago)
- Location:
- trunk/JavaScriptCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r54579 r54580 1 2010-02-09 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 New functions nullValue() and undefinedValue(). 6 7 [Qt] QScriptEngine should contain nullValue and undefinedValue methods 8 https://bugs.webkit.org/show_bug.cgi?id=34749 9 10 * qt/api/qscriptengine.cpp: 11 (QScriptEngine::nullValue): 12 (QScriptEngine::undefinedValue): 13 * qt/api/qscriptengine.h: 14 * qt/tests/qscriptengine/tst_qscriptengine.cpp: 15 (tst_QScriptEngine::nullValue): 16 (tst_QScriptEngine::undefinedValue): 17 1 18 2010-02-09 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> 2 19 -
trunk/JavaScriptCore/qt/api/qscriptengine.cpp
r53850 r54580 87 87 d_ptr->collectGarbage(); 88 88 } 89 90 /*! 91 Returns a QScriptValue of the primitive type Null. 92 93 \sa undefinedValue() 94 */ 95 QScriptValue QScriptEngine::nullValue() 96 { 97 return QScriptValue(this, QScriptValue::NullValue); 98 } 99 100 /*! 101 Returns a QScriptValue of the primitive type Undefined. 102 103 \sa nullValue() 104 */ 105 QScriptValue QScriptEngine::undefinedValue() 106 { 107 return QScriptValue(this, QScriptValue::UndefinedValue); 108 } -
trunk/JavaScriptCore/qt/api/qscriptengine.h
r53850 r54580 39 39 void collectGarbage(); 40 40 41 QScriptValue nullValue(); 42 QScriptValue undefinedValue(); 41 43 private: 42 44 friend class QScriptEnginePrivate; -
trunk/JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp
r53850 r54580 36 36 void evaluate(); 37 37 void collectGarbage(); 38 void nullValue(); 39 void undefinedValue(); 38 40 }; 39 41 … … 55 57 QCOMPARE(foo.call().toString(), QString::fromAscii("pong")); 56 58 } 59 60 void tst_QScriptEngine::nullValue() 61 { 62 QScriptEngine engine; 63 QScriptValue value = engine.nullValue(); 64 QVERIFY(value.isValid()); 65 QVERIFY(value.isNull()); 66 } 67 68 void tst_QScriptEngine::undefinedValue() 69 { 70 QScriptEngine engine; 71 QScriptValue value = engine.undefinedValue(); 72 QVERIFY(value.isValid()); 73 QVERIFY(value.isUndefined()); 74 } 75 57 76 QTEST_MAIN(tst_QScriptEngine) 58 77 #include "tst_qscriptengine.moc"
Note: See TracChangeset
for help on using the changeset viewer.