Changeset 48676

Show
Ignore:
Timestamp:
09/23/09 09:23:47 (6 months ago)
Author:
eric@webkit.org
Message:

2009-09-23 Norbert Leser < norbert.leser@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:
Location:
trunk/WebKit/qt
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/qt/Api/qwebgraphicsitem.cpp

    r48627 r48676  
    3030#include <QtGui/qgraphicssceneevent.h> 
    3131#include <QtGui/qstyleoption.h> 
     32#if defined(Q_WS_X11) 
    3233#include <QX11Info> 
     34#endif 
    3335 
    3436class QWebGraphicsItemPrivate : public QWebPageClient { 

  • trunk/WebKit/qt/Api/qwebview.cpp

    r48627 r48676  
    3232#include "qdir.h" 
    3333#include "qfile.h" 
     34#if defined(Q_WS_X11) 
    3435#include <QX11Info> 
     36#endif 
    3537 
    3638class QWebViewPrivate : public QWebPageClient { 

  • trunk/WebKit/qt/ChangeLog

    r48632 r48676  
     12009-09-23  Norbert Leser  <norbert.leser@nokia.com> 
     2 
     3        Reviewed by Tor Arne Vestbø. 
     4 
     5        Need to guard QX11Info include with Q_WS_X11. 
     6        That class may not be available (in QT 4.5 for Symbian, for instance). 
     7        Completes fixes in r48627 and r48604. 
     8 
     9        * Api/qwebgraphicsitem.cpp: 
     10        * Api/qwebview.cpp: 
     11 
    1122009-09-22  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com> 
    213