7 files changed, 90 insertions, 12 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index eb7083a..16d854d 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,8 +4,8 @@ This is a snapshot of the Qt port of WebKit from
 
 The commit imported was from the
 
-        qtwebkit-4.6-snapshot-18092009 branch/tag
+        origin/qtwebkit-4.6-staging branch/tag
 
 and has the sha1 checksum
 
-        15c07fb8d7fa5e93c939aa7eb21c06e19c754cee
+        f572f72dce91be9a4525941c87d1b0a8c383ba39
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebgraphicsitem.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebgraphicsitem.cpp
index be8f6ab..1e491c9 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebgraphicsitem.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebgraphicsitem.cpp
@@ -93,7 +93,6 @@ void QWebGraphicsItemPrivate::_q_setStatusBarMessage(const QString& s)
 /*!
     \class QWebGraphicsItem
     \brief The QWebGraphicsItem class allows web content to be added to a GraphicsView.
-    \inherits QGraphicsWidget.
     \since 4.6
 
     A WebGraphicsItem renders web content based on a URL or set data.
@@ -350,7 +349,7 @@ QString QWebGraphicsItem::status() const
 /*!
     Convenience slot that stops loading the document.
 
-    \sa reload(), pageAction(), loadFinished()
+    \sa reload(), loadFinished()
 */
 void QWebGraphicsItem::stop()
 {
@@ -362,7 +361,7 @@ void QWebGraphicsItem::stop()
     Convenience slot that loads the previous document in the list of documents
     built by navigating links. Does nothing if there is no previous document.
 
-    \sa forward(), pageAction()
+    \sa forward()
 */
 void QWebGraphicsItem::back()
 {
@@ -374,7 +373,7 @@ void QWebGraphicsItem::back()
     Convenience slot that loads the next document in the list of documents
     built by navigating links. Does nothing if there is no next document.
 
-    \sa back(), pageAction()
+    \sa back()
 */
 void QWebGraphicsItem::forward()
 {
@@ -385,7 +384,7 @@ void QWebGraphicsItem::forward()
 /*!
     Reloads the current document.
 
-    \sa stop(), pageAction(), loadStarted()
+    \sa stop(), loadStarted()
 */
 void QWebGraphicsItem::reload()
 {
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebplugindatabase.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebplugindatabase.cpp
index a3781e6..623895f 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebplugindatabase.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebplugindatabase.cpp
@@ -195,16 +195,26 @@ bool QWebPluginInfo::isEnabled() const
     return m_package->isEnabled();
 }
 
+/*!
+    Returns true if this plugin info is the same as the \a other plugin info.
+*/
 bool QWebPluginInfo::operator==(const QWebPluginInfo& other) const
 {
     return m_package == other.m_package;
 }
 
+/*!
+    Returns true if this plugin info is different from the \a other plugin info.
+*/
 bool QWebPluginInfo::operator!=(const QWebPluginInfo& other) const
 {
     return m_package != other.m_package;
 }
 
+/*!
+    Assigns the \a other plugin info to this plugin info, and returns a reference
+    to this plugin info.
+*/
 QWebPluginInfo &QWebPluginInfo::operator=(const QWebPluginInfo& other)
 {
     if (this == &other)
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
index e63ba41..8ff13b1 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
@@ -76,6 +76,9 @@
     \inmodule QtWebKit
 */
 
+/*!
+    Returns true if this mimetype is the same as the \a other mime type.
+*/
 bool QWebPluginFactory::MimeType::operator==(const MimeType& other) const
 {
     return name == other.name
@@ -84,6 +87,12 @@ bool QWebPluginFactory::MimeType::operator==(const MimeType& other) const
 }
 
 /*!
+    \fn bool QWebPluginFactory::MimeType::operator!=(const MimeType& other) const
+
+    Returns true if this mimetype is different from the \a other mime type.
+*/
+
+/*!
     \variable QWebPluginFactory::MimeType::name
 
     The full name of the MIME type; e.g., \c{text/plain} or \c{image/png}.
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
index 45c49c6..7c44e37 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
@@ -202,8 +202,9 @@ QList<QWebDatabase> QWebSecurityOrigin::databases() const
 
 /*!
     \since 4.6
-    Allow applications to use a custome scheme instead of file: scheme,
-    without being subjected to cross domain restrictions.
+
+    Adds the given \a scheme to the list of schemes that are considered equivalent
+    to the \c file: scheme. They are not subject to cross domain restrictions.
 */
 void QWebSecurityOrigin::addLocalScheme(const QString& scheme)
 {
@@ -212,8 +213,10 @@ void QWebSecurityOrigin::addLocalScheme(const QString& scheme)
 
 /*!
     \since 4.6
-    Allow applications to stop using a custome scheme that was previously used,
-    \sa addLocalScheme().
+
+    Removes the given \a scheme from the list of local schemes.
+
+    \sa addLocalScheme()
 */
 void QWebSecurityOrigin::removeLocalScheme(const QString& scheme)
 {
@@ -223,7 +226,7 @@ void QWebSecurityOrigin::removeLocalScheme(const QString& scheme)
 /*!
     \since 4.6
     Returns a list of all the schemes that were set by the application as local schemes,
-    \sa addLocalScheme(), removeLocalScheme().
+    \sa addLocalScheme(), removeLocalScheme()
 */
 QStringList QWebSecurityOrigin::localSchemes()
 {
@@ -237,11 +240,19 @@ QStringList QWebSecurityOrigin::localSchemes()
     return list;
 }
 
+/*!
+    \since 4.6
+    \internal
+*/
 void QWebSecurityOrigin::whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains)
 {
     SecurityOrigin::whiteListAccessFromOrigin(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
 }
 
+/*!
+    \since 4.6
+    \internal
+*/
 void QWebSecurityOrigin::resetOriginAccessWhiteLists()
 {
     SecurityOrigin::resetOriginAccessWhiteLists();
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 8ec6b86..c4c9523 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,25 @@
+2009-09-18  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        Fixed a bunch of documentation warnings.
+
+        * Api/qwebgraphicsitem.cpp:
+        * Api/qwebplugindatabase.cpp:
+        * Api/qwebpluginfactory.cpp:
+        * Api/qwebsecurityorigin.cpp:
+
+2009-09-18  Warwick Allison  <warwick.allison@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Added a test that console output works.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (ConsolePage::ConsolePage):
+        (ConsolePage::javaScriptConsoleMessage):
+        (tst_QWebPage::consoleOutput):
+
 2009-09-17  Janne Koskinen  <janne.p.koskinen@digia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 121d7cb..c575137 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -114,6 +114,8 @@ private slots:
     void testOptionalJSObjects();
     void testEnablePersistentStorage();
 
+    void consoleOutput();
+
 private:
 
 
@@ -241,6 +243,31 @@ void tst_QWebPage::loadFinished()
     QCOMPARE(spyLoadFinished.count(), 1);
 }
 
+class ConsolePage : public QWebPage
+{
+public:
+    ConsolePage(QObject* parent = 0) : QWebPage(parent) {}
+
+    virtual void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
+    {
+        messages.append(message);
+        lineNumbers.append(lineNumber);
+        sourceIDs.append(sourceID);
+    }
+
+    QStringList messages;
+    QList<int> lineNumbers;
+    QStringList sourceIDs;
+};
+
+void tst_QWebPage::consoleOutput()
+{
+    ConsolePage page;
+    page.mainFrame()->evaluateJavaScript("this is not valid JavaScript");
+    QCOMPARE(page.messages.count(), 1);
+    QCOMPARE(page.lineNumbers.at(0), 1);
+}
+
 class TestPage : public QWebPage
 {
 public: