Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

6 files changed, 54 insertions, 3 deletions

diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index af48a6e..da530c8 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
 
 and has the sha1 checksum
 
-        70604503a0365edaeff82ffad7b71f90641fa592
+        0b6fc217c2b853827926313c09bb3c32f66ffe43
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 10a3840..3b20751 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-02-06  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Fix bug in clearRect(). Use fillRect() instead of eraseRect() to get
+        the context transparent.
+
+        [QT] clearRect fill's a given rect with white
+        https://bugs.webkit.org/show_bug.cgi?id=23728
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::clearRect):
+
 2009-03-19  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 80a6390..1830566 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -815,7 +815,7 @@ void GraphicsContext::clearRect(const FloatRect& rect)
     QPainter::CompositionMode currentCompositionMode = p->compositionMode();
     if (p->paintEngine()->hasFeature(QPaintEngine::PorterDuff))
         p->setCompositionMode(QPainter::CompositionMode_Source);
-    p->eraseRect(rect);
+    p->fillRect(rect, Qt::transparent);
     if (p->paintEngine()->hasFeature(QPaintEngine::PorterDuff))
         p->setCompositionMode(currentCompositionMode);
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 5e3c656..636b6e8 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -533,6 +533,8 @@ void QWebPagePrivate::updateEditorActions()
     updateAction(QWebPage::ToggleBold);
     updateAction(QWebPage::ToggleItalic);
     updateAction(QWebPage::ToggleUnderline);
+    updateAction(QWebPage::InsertParagraphSeparator);
+    updateAction(QWebPage::InsertLineSeparator);
 }
 
 void QWebPagePrivate::timerEvent(QTimerEvent *ev)
@@ -1792,6 +1794,13 @@ QAction *QWebPage::action(WebAction action) const
             text = contextMenuItemTagInspectElement();
             break;
 
+        case InsertParagraphSeparator:
+            text = tr("Insert a new paragraph");
+            break;
+        case InsertLineSeparator:
+            text = tr("Insert a new line");
+            break;
+
         case NoWebAction:
             return 0;
     }
@@ -2319,7 +2328,8 @@ QWebPluginFactory *QWebPage::pluginFactory() const
     \list
     \o %Platform% and %Subplatform% are expanded to the windowing system and the operation system.
     \o %Security% expands to U if SSL is enabled, otherwise N. SSL is enabled if QSslSocket::supportsSsl() returns true.
-    \o %Locale% is replaced with QLocale::name().
+    \o %Locale% is replaced with QLocale::name(). The locale is determined from the view of the QWebPage. If no view is set on the QWebPage,
+    then a default constructed QLocale is used instead.
     \o %WebKitVersion% currently expands to 527+
     \o %AppVersion% expands to QCoreApplication::applicationName()/QCoreApplication::applicationVersion() if they're set; otherwise defaulting to Qt and the current Qt version.
     \endlist
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 0755133..32d27cd 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,25 @@
+2009-03-26  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Rubber-stamped by Tor Arne Vestbø.
+
+        Fix the documentation of the QLocale usage in userAgentForUrl.
+
+        * Api/qwebpage.cpp:
+
+2009-03-20  Erik L. Bunce  <elbunce@xendom.com>
+
+        Reviewed by Simon Hausmann.
+
+        Fix for InsertParagraphSeparator and InsertLineSeparator so that
+        QWebPage::action() creates QActions for them. Also make sure they get
+        updated appropriately.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::updateEditorActions):
+        (QWebPage::action):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::textEditing):
+
 2009-03-20  Erik L. Bunce  <elbunce@xendom.com>
 
         Reviewed by Tor Arne Vestbø.
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 54d342e..d85e880 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -956,6 +956,8 @@ void tst_QWebPage::textEditing()
     QVERIFY(page->action(QWebPage::ToggleBold) != 0);
     QVERIFY(page->action(QWebPage::ToggleItalic) != 0);
     QVERIFY(page->action(QWebPage::ToggleUnderline) != 0);
+    QVERIFY(page->action(QWebPage::InsertParagraphSeparator) != 0);
+    QVERIFY(page->action(QWebPage::InsertLineSeparator) != 0);
 
     // right now they are disabled because contentEditable is false
     QCOMPARE(page->action(QWebPage::DeleteStartOfWord)->isEnabled(), false);
@@ -966,6 +968,8 @@ void tst_QWebPage::textEditing()
     QCOMPARE(page->action(QWebPage::ToggleBold)->isEnabled(), false);
     QCOMPARE(page->action(QWebPage::ToggleItalic)->isEnabled(), false);
     QCOMPARE(page->action(QWebPage::ToggleUnderline)->isEnabled(), false);
+    QCOMPARE(page->action(QWebPage::InsertParagraphSeparator)->isEnabled(), false);
+    QCOMPARE(page->action(QWebPage::InsertLineSeparator)->isEnabled(), false);
 
     // make it editable before navigating the cursor
     page->setContentEditable(true);
@@ -979,6 +983,8 @@ void tst_QWebPage::textEditing()
     QCOMPARE(page->action(QWebPage::ToggleBold)->isEnabled(), true);
     QCOMPARE(page->action(QWebPage::ToggleItalic)->isEnabled(), true);
     QCOMPARE(page->action(QWebPage::ToggleUnderline)->isEnabled(), true);
+    QCOMPARE(page->action(QWebPage::InsertParagraphSeparator)->isEnabled(), true);
+    QCOMPARE(page->action(QWebPage::InsertLineSeparator)->isEnabled(), true);
 
     delete page;
 }