[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c48fbca997764f7430dac7f7cc70aaf98f3f7443
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 11:28:01 2009 +0000

    2009-10-19  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Fix build on Windows.
    
            * plugins/win/PluginViewWin.cpp:
            (windowHandleForPageClient):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49772 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0dc7b18..a8bdc06 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Fix build on Windows.
+
+        * plugins/win/PluginViewWin.cpp:
+        (windowHandleForPageClient):
+
 2009-10-19  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Holger Freyther.
diff --git a/WebCore/plugins/win/PluginViewWin.cpp b/WebCore/plugins/win/PluginViewWin.cpp
index 6887af6..e1bf8d6 100644
--- a/WebCore/plugins/win/PluginViewWin.cpp
+++ b/WebCore/plugins/win/PluginViewWin.cpp
@@ -77,6 +77,7 @@
 
 #if PLATFORM(QT)
 #include "QWebPageClient.h"
+#include <QWidget>
 #endif
 
 static inline HWND windowHandleForPageClient(PlatformPageClient client)
@@ -84,7 +85,7 @@ static inline HWND windowHandleForPageClient(PlatformPageClient client)
 #if PLATFORM(QT)
     if (!client)
         return 0;
-    return client->winId();
+    return client->ownerWidget()->winId();
 #else
     return client;
 #endif

-- 
WebKit Debian packaging