diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 17:44:49 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-12 19:24:55 (GMT) |
| commit | 615d91154dbca23c0dcd0e845ff9506971f9919a (patch) | |
| tree | 628a033b3b84c6f6d005081a5ca1d8580388a5f5 /src/3rdparty | |
| parent | e7bd289b2d748e0d326f34be9bf1db51058d8f01 (diff) | |
| download | Qt-615d91154dbca23c0dcd0e845ff9506971f9919a.zip Qt-615d91154dbca23c0dcd0e845ff9506971f9919a.tar.gz Qt-615d91154dbca23c0dcd0e845ff9506971f9919a.tar.bz2 | |
QtWebKit: Add missing namespace wrapper temporarily until next import.
Rubber-stamped-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty')
6 files changed, 13 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h index 5a97c86..7c8731f 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h @@ -60,7 +60,9 @@ typedef WKCACFLayer PlatformLayer; typedef void* NativeLayer; } #elif PLATFORM(QT) +QT_BEGIN_NAMESPACE class QGraphicsItem; +QT_END_NAMESPACE typedef QGraphicsItem PlatformLayer; typedef QGraphicsItem* NativeLayer; #elif PLATFORM(CHROMIUM) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/Tile.h b/src/3rdparty/webkit/WebCore/platform/graphics/Tile.h index c55fcaf..c623ec9 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/Tile.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/Tile.h @@ -29,8 +29,10 @@ #include <wtf/RefCounted.h> #if PLATFORM(QT) +QT_BEGIN_NAMESPACE class QPixmap; class QRegion; +QT_END_NAMESPACE #endif namespace WebCore { diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h index 8f8229b..d72404c 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h @@ -25,9 +25,11 @@ #include <QMediaPlayer> #include <QObject> +QT_BEGIN_NAMESPACE class QMediaPlayerControl; class QGraphicsVideoItem; class QGraphicsScene; +QT_END_NAMESPACE namespace WebCore { diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h b/src/3rdparty/webkit/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h index 86b367b..15a48cd 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h +++ b/src/3rdparty/webkit/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h @@ -27,7 +27,9 @@ namespace QtMobility { class QNetworkConfigurationManager; } #else +QT_BEGIN_NAMESPACE class QNetworkConfigurationManager; +QT_END_NAMESPACE #endif namespace WebCore { diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h index 90ad29e..f8f217b 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h @@ -34,7 +34,10 @@ #include "KURL.h" #include "PlatformString.h" +QT_BEGIN_NAMESPACE class QEventLoop; +QT_END_NAMESPACE + class QWebPage; namespace WebCore { diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h index 9d1183f..62b8aea 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h @@ -23,7 +23,9 @@ #include "QtAbstractWebPopup.h" #include <QComboBox> +QT_BEGIN_NAMESPACE class QGraphicsProxyWidget; +QT_END_NAMESPACE namespace WebCore { |