diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 15:10:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 15:10:14 (GMT) |
| commit | 9df6404fc9d11b0e56ff3ff657eb136f46f32fb4 (patch) | |
| tree | ede0b01870197b793973f4cb39d487f24d2c8844 /tests/benchmarks/network | |
| parent | b9d27071bc9754ce6809b7367e8ed7fa921eeb7b (diff) | |
| parent | f2a68528ba235d5170806dad7007652842774798 (diff) | |
| download | Qt-9df6404fc9d11b0e56ff3ff657eb136f46f32fb4.zip Qt-9df6404fc9d11b0e56ff3ff657eb136f46f32fb4.tar.gz Qt-9df6404fc9d11b0e56ff3ff657eb136f46f32fb4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
Import SunSpider benchmarks for QtScript
Import V8 benchmarks for QtScript
Add more microbenchmarks for QScriptValue
Add more microbenchmarks for QScriptEngine
QNAM HTTP: Do not set cache headers when already set by user
QNAM: Do not cache network connections per username.
Refactor tst_QScriptValue::instanceOf
Refactor tst_QScriptValue::getSetPrototype
Refactor tst_QScriptValue::getSetProperty
Refactor tst_QScriptValue::getSetData
Refactor tst_QScriptValue::isError
Refactor tst_QScriptValue::isRegExp
Refactor tst_QScriptValue::isDate
Refactor tst_QScriptValue::isArray
Increase range of getSetScriptClass test.
Rename few QScriptValue's test cases.
Separate generated tests from hand written ones.
Split tst_QScriptValue::getSetScriptClass autotest.
Split tst_QScriptValue::ctor autotest.
Compile with Qt namespace
...
Diffstat (limited to 'tests/benchmarks/network')
| -rw-r--r-- | tests/benchmarks/network/network.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/benchmarks/network/network.pro b/tests/benchmarks/network/network.pro index 73de556..692a0a1 100644 --- a/tests/benchmarks/network/network.pro +++ b/tests/benchmarks/network/network.pro @@ -4,3 +4,10 @@ SUBDIRS = \ kernel \ ssl \ socket + +TRUSTED_BENCHMARKS += \ + kernel/qhostinfo \ + socket/qtcpserver \ + ssl/qsslsocket + +include(../trusted-benchmarks.pri)
\ No newline at end of file |