[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3baa0a0ecef2fe89d6746b129e0ff7dbecbb58e3
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 08:42:08 2010 +0000

    Prospective build fix for the Qt build.
    
    Fix compilation against Qt without WebKit support by not including QtWebKit/QWebView
    but widget.h instead and instantiating QWebView through a typedef, to ensure we're using
    our locally built WebKit.
    
    * tests/hybridPixmap/widget.h:
    * tests/hybridPixmap/widget.ui:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b1e4a59..4f002c8 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-21  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Prospective build fix for the Qt build.
+
+        Fix compilation against Qt without WebKit support by not including QtWebKit/QWebView
+        but widget.h instead and instantiating QWebView through a typedef, to ensure we're using
+        our locally built WebKit.
+
+        * tests/hybridPixmap/widget.h:
+        * tests/hybridPixmap/widget.ui:
+
 2010-01-21  No'am Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/tests/hybridPixmap/widget.h b/WebKit/qt/tests/hybridPixmap/widget.h
index fab935e..a49f8ba 100644
--- a/WebKit/qt/tests/hybridPixmap/widget.h
+++ b/WebKit/qt/tests/hybridPixmap/widget.h
@@ -23,6 +23,9 @@
 #include <QImage>
 #include <QPixmap>
 #include <QWidget>
+#include "qwebview.h"
+
+typedef QWebView WebView;
 
 namespace Ui {
 class Widget;
diff --git a/WebKit/qt/tests/hybridPixmap/widget.ui b/WebKit/qt/tests/hybridPixmap/widget.ui
index 95de928..4f2b3b8 100644
--- a/WebKit/qt/tests/hybridPixmap/widget.ui
+++ b/WebKit/qt/tests/hybridPixmap/widget.ui
@@ -15,8 +15,8 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QWebView" name="webView">
-     <property name="url">
+    <widget class="WebView" name="webView" native="true">
+     <property name="url" stdset="0">
       <url>
        <string>about:blank</string>
       </url>
@@ -85,9 +85,9 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QWebView</class>
+   <class>WebView</class>
    <extends>QWidget</extends>
-   <header>QtWebKit/QWebView</header>
+   <header>widget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

-- 
WebKit Debian packaging