diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 11:37:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 11:37:43 (GMT) |
| commit | 5fef7ab5fc29806742a8d32083a10c59733f4912 (patch) | |
| tree | a709a009f18da9b41266d1843b56efed1bb036c1 /doc/src/snippets/code/src_script_qscriptcontext.cpp | |
| parent | a64d3dddfbe22b26fd0d2d1e7387ed7125951109 (diff) | |
| parent | c04c3fe2bc6a7ffd02052e0c0208b8716907063a (diff) | |
| download | Qt-5fef7ab5fc29806742a8d32083a10c59733f4912.zip Qt-5fef7ab5fc29806742a8d32083a10c59733f4912.tar.gz Qt-5fef7ab5fc29806742a8d32083a10c59733f4912.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: (38 commits)
Refactor tst_QScriptContext::throwError test.
Fixed whitespace.
Don't use scopes in mkspecs as configure does not support them
Fixed destination path for the S60 feedback plugin.
Don't put Objective-C sources in SOURCES
Fix regression in tst_maketestselftest::naming_convention.
Split monolithic QScriptEngine autotests into smaller tests
Add SunSpider and V8 benchmarks to benchmarks/script.pro
Push and pop the thread-default context for the current thread
Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
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
...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptcontext.cpp')
0 files changed, 0 insertions, 0 deletions