[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 c2fec9cbaefd9e4688c86ce1fa2b2455b27e6909
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 23 16:23:47 2009 +0000

    2009-09-23  Norbert Leser  <norbert.leser at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            Need to guard QX11Info include with Q_WS_X11.
            That class may not be available (in QT 4.5 for Symbian, for instance).
            Completes fixes in r48627 and r48604.
    
            * Api/qwebgraphicsitem.cpp:
            * Api/qwebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebgraphicsitem.cpp b/WebKit/qt/Api/qwebgraphicsitem.cpp
index 68018f4..196f0b8 100644
--- a/WebKit/qt/Api/qwebgraphicsitem.cpp
+++ b/WebKit/qt/Api/qwebgraphicsitem.cpp
@@ -29,7 +29,9 @@
 #include <QtGui/qapplication.h>
 #include <QtGui/qgraphicssceneevent.h>
 #include <QtGui/qstyleoption.h>
+#if defined(Q_WS_X11)
 #include <QX11Info>
+#endif
 
 class QWebGraphicsItemPrivate : public QWebPageClient {
 public:
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 115ea3e..c7515ab 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -31,7 +31,9 @@
 #include "qprinter.h"
 #include "qdir.h"
 #include "qfile.h"
+#if defined(Q_WS_X11)
 #include <QX11Info>
+#endif
 
 class QWebViewPrivate : public QWebPageClient {
 public:
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index aa78952..9298f3d 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-23  Norbert Leser  <norbert.leser at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Need to guard QX11Info include with Q_WS_X11.
+        That class may not be available (in QT 4.5 for Symbian, for instance).
+        Completes fixes in r48627 and r48604.
+
+        * Api/qwebgraphicsitem.cpp:
+        * Api/qwebview.cpp:
+
 2009-09-22  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging