diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 18:00:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 18:00:21 (GMT) |
| commit | a747e171d316b25ba10dc36f6d54d1cbecad5c32 (patch) | |
| tree | eb2cb8b2c5d8c2cc58e9a4924efa1f81bfa87a17 /src/3rdparty/javascriptcore/VERSION | |
| parent | b80466364fe6c6ca030b884f2d8df94bdfa477b9 (diff) | |
| parent | 0d8964f78582a144ee5e96f40fcb6240d2e58a46 (diff) | |
| download | Qt-a747e171d316b25ba10dc36f6d54d1cbecad5c32.zip Qt-a747e171d316b25ba10dc36f6d54d1cbecad5c32.tar.gz Qt-a747e171d316b25ba10dc36f6d54d1cbecad5c32.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
Compile
QtScript: Improve performance of type resolution when calling slots
Improve performance of QScriptValueIterator
Add default argument values for QScriptValuePrivate property functions
Move method implementation to private class
Add benchmarks for QScriptValueIterator
Fixed the QML browser built into the QML viewer
Make configure.exe fail for declarative if no script support
Add QWidget::update() test.
Add license headers
Import static contents tests from old manualtests
Fix Build Failure for Maemo 5 Debug Build
Add ability to read last mod.time for zip entry.
Avoid asserting when index passed to QZipReader::entryInfoAt is out of boundaries
Add isValid() method to QZipReader::FileInfo.
Add `QIODevice* device() const` public method to QZip classes.
Rebuild configure.exe (again enable QtDeclarative module by default)
Update src/3rdparty/javascriptcore and adapt src/script to the changes
Use index-based approach for iterating over JS array properties
QFSFileEngine reduce number of system calls
...
Diffstat (limited to 'src/3rdparty/javascriptcore/VERSION')
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION index d75862d..6351105 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION @@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from The commit imported was from the - jsc-for-qtscript-4.6-staging-06102009 branch/tag + javascriptcore-snapshot-23022010 branch/tag and has the sha1 checksum - 32d226eb14d44f80e9ec96d4ca2c595181eeeca3 + 8a21225144f7c1e10ffcb9aa7a545164d9495bf2 |