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: (83 commits)
  probably need to update user configurations once in a while too
  use dynamicstore instead
  Define JS_NO_EXPORT to avoid JSC C API functions being exported
  Don't use QScriptValueIterator to iterate over an array
  QtScript: Fix regression when calling newQObject() from native constructor
  Added note to OS X installation instructions.
  Keypress events ignored in listview on Cocoa (64 Bit) with Japanese IME
  Update only appropriate rectangles during update_sys().
  Marked QTDS obsolete from Qt 4.7.
  QNetworkReply: Fix canReadLine()
  Abort waiting replies on session error.
  different approach to fixing "the other" aliasing issue
  fix aliasing issue in node_construct()
  detach in fewer cases, remove redundant calculation
  SSL: Fix memleak related to local certificate
  Improve keyboard layout detection on X11
  Compile on ARM with -Werror -Wold-style-cast
  Use the vista-style native dialog for QFileDialog::getExistingDirectory
  Apply the stdset attribute for resource properties
  doc: Completed sentence about HideNameFilterDetails
  ...

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