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
  ...

1 files changed, 6 insertions, 1 deletions

diff --git a/util/webkit/mkdist-javascriptcore b/util/webkit/mkdist-javascriptcore
index 07419ea..30d90da 100755
--- a/util/webkit/mkdist-javascriptcore
+++ b/util/webkit/mkdist-javascriptcore
@@ -5,7 +5,7 @@ die() {
     exit 1
 }
 
-default_tag="javascriptcore-4.6-snapshot-29072009"
+default_tag="javascriptcore-snapshot-02022010"
 
 if [ $# -eq 0 ]; then
     tag="$default_tag"
@@ -35,6 +35,8 @@ excluded_directories="$excluded_directories JavaScriptCore/wtf/win"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/chromium"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/haiku"
 excluded_directories="$excluded_directories JavaScriptCore/icu"
+excluded_directories="$excluded_directories JavaScriptCore/qt"
+excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.gyp"
 
 
 files_to_remove=""
@@ -42,6 +44,9 @@ files_to_remove="$files_to_remove JavaScriptCore/AllInOneFile.cpp"
 files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCoreSources.bkl"
 files_to_remove="$files_to_remove JavaScriptCore/jscore.bkl"
 files_to_remove="$files_to_remove JavaScriptCore/jsc.pro"
+files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCore.pro"
+files_to_remove="$files_to_remove JavaScriptCore/DerivedSources.pro"
+files_to_remove="$files_to_remove JavaScriptCore/create_rvct_stubs"
 
 require_clean_work_tree() {
     # test if working tree is dirty