diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 12:22:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 12:22:48 (GMT) |
| commit | e14868518a1c002af440e011a792650d1e723cd3 (patch) | |
| tree | 6ffb89f898e0cd4521f53ba8a3053d7033684626 /doc/src/snippets/code/src_script_qscriptable.cpp | |
| parent | 953ff11a1b424dd288b6504c5a6f918acaebaa60 (diff) | |
| parent | 6bc9e82e568eee98f7546b9d131e7bcf23a4f0a1 (diff) | |
| download | Qt-e14868518a1c002af440e011a792650d1e723cd3.zip Qt-e14868518a1c002af440e011a792650d1e723cd3.tar.gz Qt-e14868518a1c002af440e011a792650d1e723cd3.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: (39 commits)
There is no predefined qmake x11 scope for x11 builds.
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
...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptable.cpp')
0 files changed, 0 insertions, 0 deletions