diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-27 03:52:16 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-27 05:10:06 (GMT) |
commit | 62c33357cec8924f2383042c544636ec5aae1c97 (patch) | |
tree | 3c1c6f975710807d10546631b58fb0c52bd2fb50 /tests/benchmarks | |
parent | 4b112230229544b13c254acd8a10b67939c79f22 (diff) | |
parent | c52061e7980fcde5d59a7657a254ce00d117b611 (diff) | |
download | Qt-62c33357cec8924f2383042c544636ec5aae1c97.zip Qt-62c33357cec8924f2383042c544636ec5aae1c97.tar.gz Qt-62c33357cec8924f2383042c544636ec5aae1c97.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp b/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp index 904674e..b637591 100644 --- a/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/benchmarks/qscriptvalue/tst_qscriptvalue.cpp @@ -68,6 +68,7 @@ private slots: void toQObject(); void property(); void setProperty(); + void propertyFlags(); }; tst_QScriptValue::tst_QScriptValue() @@ -189,5 +190,16 @@ void tst_QScriptValue::setProperty() } } +void tst_QScriptValue::propertyFlags() +{ + QScriptEngine engine; + QScriptValue obj = engine.newObject(); + QString propertyName = QString::fromLatin1("foo"); + obj.setProperty(propertyName, 123, QScriptValue::SkipInEnumeration | QScriptValue::ReadOnly); + QBENCHMARK { + (void)obj.propertyFlags(propertyName); + } +} + QTEST_MAIN(tst_QScriptValue) #include "tst_qscriptvalue.moc" |