Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits)
  Make sure the declarative plugin of QtWebKit is build once.
  Make sure JavaScriptCore is build once.
  Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
  2011-05-23 Matthew Delaney <mdelaney@apple.com>
  Fix headers generation for QtWebKit.
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.
  Fix the auto-tests of QtWebKit.
  2011-06-27 Joe Wild <joseph.wild@nokia.com>
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b
  Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90
  Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114
  Make QtWebKit actually works when linked to an application.
  Attempt to get Symbian building with SQLite.
  Make the headers test pass by including QtGui/QColor instead of QColor.
  Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG.
  Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.
  Use WTF::notFound instead of -1 to check for Vector::find() errors.
  The autotests don't even build on Symbian, skip them for now.
  ...

6 files changed, 9 insertions, 6 deletions

diff --git a/tests/auto/qwebelement/qwebelement.pro b/tests/auto/qwebelement/qwebelement.pro
index ac809b8..b397978 100644
--- a/tests/auto/qwebelement/qwebelement.pro
+++ b/tests/auto/qwebelement/qwebelement.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
     isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
     isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
 
-    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebelement
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebelement
     VPATH += $$TESTDIR
     include($$TESTDIR/qwebelement.pro)
 } else {
diff --git a/tests/auto/qwebframe/qwebframe.pro b/tests/auto/qwebframe/qwebframe.pro
index 1d51f4c..f123103 100644
--- a/tests/auto/qwebframe/qwebframe.pro
+++ b/tests/auto/qwebframe/qwebframe.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
     isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
     isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
 
-    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebframe
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe
     VPATH += $$TESTDIR
     include($$TESTDIR/qwebframe.pro)
 } else {
diff --git a/tests/auto/qwebhistory/qwebhistory.pro b/tests/auto/qwebhistory/qwebhistory.pro
index 232f478..7831e24 100644
--- a/tests/auto/qwebhistory/qwebhistory.pro
+++ b/tests/auto/qwebhistory/qwebhistory.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
     isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
     isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
 
-    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebhistory
     VPATH += $$TESTDIR
     include($$TESTDIR/qwebhistory.pro)
 } else {
diff --git a/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro b/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
index 7218f52..4bf9580 100644
--- a/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
+++ b/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
     isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
     isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
 
-    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebhistoryinterface
     VPATH += $$TESTDIR
     include($$TESTDIR/qwebhistoryinterface.pro)
 } else {
diff --git a/tests/auto/qwebpage/qwebpage.pro b/tests/auto/qwebpage/qwebpage.pro
index 47e3238..8d2b5c0 100644
--- a/tests/auto/qwebpage/qwebpage.pro
+++ b/tests/auto/qwebpage/qwebpage.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
     isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
     isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
 
-    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebpage
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebpage
     VPATH += $$TESTDIR
     include($$TESTDIR/qwebpage.pro)
 } else {
diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp
index d2c8c24..00486d2 100644
--- a/tests/auto/symbols/tst_symbols.cpp
+++ b/tests/auto/symbols/tst_symbols.cpp
@@ -264,6 +264,9 @@ void tst_Symbols::prefix()
     excusedPrefixes["QtSql"] =
         QStringList() << "sqlite3";
 
+    excusedPrefixes["QtScript"] =
+        QStringList() << "QTJSC";
+
     excusedPrefixes["QtWebKit"] =
         QStringList() << "WebCore::"
                       << "KJS::"
@@ -294,7 +297,7 @@ void tst_Symbols::prefix()
 
     bool isFailed = false;
     foreach (QString lib, files) {
-        if (lib.contains("Designer") || lib.contains("QtCLucene") || lib.contains("XmlPatternsSDK"))
+        if (lib.contains("Designer") || lib.contains("QtCLucene") || lib.contains("XmlPatternsSDK") || lib.contains("WebKit"))
             continue;
 
         bool isPhonon = lib.contains("phonon");