diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 04:36:14 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 04:36:14 (GMT) |
commit | 6bc9e82e568eee98f7546b9d131e7bcf23a4f0a1 (patch) | |
tree | afd994574d58db0e0fcb02f0df7bc08436d5783a /src/s60installs/qt.iby | |
parent | b59b90678d061bf5935a47385be7f2a31e8eb935 (diff) | |
parent | e6fc299b7e15ceeb35a4f9c785e4cc3da201445f (diff) | |
download | Qt-6bc9e82e568eee98f7546b9d131e7bcf23a4f0a1.zip Qt-6bc9e82e568eee98f7546b9d131e7bcf23a4f0a1.tar.gz Qt-6bc9e82e568eee98f7546b9d131e7bcf23a4f0a1.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 'src/s60installs/qt.iby')
0 files changed, 0 insertions, 0 deletions