Diff
Modified: trunk/Source/WebCore/ChangeLog (123455 => 123456)
--- trunk/Source/WebCore/ChangeLog 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebCore/ChangeLog 2012-07-24 11:33:43 UTC (rev 123456)
@@ -1,3 +1,13 @@
+2012-07-23 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Fix compilation against namespaced Qt
+
+ Reviewed by Simon Hausmann.
+
+ * platform/graphics/Font.h:
+ * platform/network/ResourceHandleInternal.h:
+ * platform/qt/ThirdPartyCookiesQt.h:
+
2012-07-24 Anthony Scian <[email protected]>
Web Inspector [JSC]: Enable initiator column in network panel.
Modified: trunk/Source/WebCore/platform/graphics/Font.h (123455 => 123456)
--- trunk/Source/WebCore/platform/graphics/Font.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -38,7 +38,9 @@
#if PLATFORM(QT)
#if HAVE(QRAWFONT)
#include <QRawFont>
+QT_BEGIN_NAMESPACE
class QTextLayout;
+QT_END_NAMESPACE
#else
#include <QFont>
#endif
Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (123455 => 123456)
--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -54,7 +54,9 @@
#endif
#if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QWebNetworkJob;
+QT_END_NAMESPACE
namespace WebCore {
class QNetworkReplyHandler;
}
Modified: trunk/Source/WebCore/platform/qt/ThirdPartyCookiesQt.h (123455 => 123456)
--- trunk/Source/WebCore/platform/qt/ThirdPartyCookiesQt.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebCore/platform/qt/ThirdPartyCookiesQt.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -20,8 +20,10 @@
#ifndef ThirdPartyCookiesQt_h
#define ThirdPartyCookiesQt_h
+QT_BEGIN_NAMESPACE
class QNetworkCookieJar;
class QUrl;
+QT_END_NAMESPACE
namespace WebCore {
class NetworkingContext;
Modified: trunk/Source/WebKit/qt/ChangeLog (123455 => 123456)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-24 11:33:43 UTC (rev 123456)
@@ -1,3 +1,12 @@
+2012-07-23 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Fix compilation against namespaced Qt
+
+ Reviewed by Simon Hausmann.
+
+ * WebCoreSupport/GeolocationClientQt.h:
+ * examples/platformplugin/WebPlugin.h:
+
2012-07-23 Pierre Rossi <[email protected]>
Unify numTouchEventHandlersChanged and needTouchEvents in the chrome client
Modified: trunk/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h (123455 => 123456)
--- trunk/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -39,7 +39,9 @@
using namespace QtMobility;
#elif HAVE(QT5)
#include <QtLocation/QGeoPositionInfo>
+QT_BEGIN_NAMESPACE
class QGeoPositionInfoSource;
+QT_END_NAMESPACE
#endif
Modified: trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.h (123455 => 123456)
--- trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -28,8 +28,10 @@
#include <QVideoWidget>
#endif
+QT_BEGIN_NAMESPACE
class QListWidgetItem;
class QListWidget;
+QT_END_NAMESPACE
class Popup : public QDialog {
Q_OBJECT
Modified: trunk/Source/WebKit2/ChangeLog (123455 => 123456)
--- trunk/Source/WebKit2/ChangeLog 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-24 11:33:43 UTC (rev 123456)
@@ -1,3 +1,28 @@
+2012-07-23 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Fix compilation against namespaced Qt
+
+ Reviewed by Simon Hausmann.
+
+ * Platform/CoreIPC/Connection.h:
+ * Platform/PlatformProcessIdentifier.h:
+ * Platform/WorkQueue.h:
+ * Shared/qt/QtNetworkRequestData.h:
+ * Shared/qt/WebEventFactoryQt.h:
+ * UIProcess/API/C/qt/WKNativeEvent.h:
+ * UIProcess/API/qt/qquickwebview_p.h:
+ * UIProcess/API/qt/qwebnavigationhistory_p.h:
+ * UIProcess/API/qt/raw/qrawwebview_p.h:
+ * UIProcess/DrawingAreaProxy.h:
+ * UIProcess/Launcher/ThreadLauncher.h:
+ * UIProcess/LayerTreeCoordinatorProxy.h:
+ * UIProcess/qt/QtViewportHandler.h:
+ * UIProcess/qt/QtWebPageSGNode.h:
+ * UIProcess/qt/WebColorChooserProxyQt.h:
+ * UIProcess/qt/WebGeolocationProviderQt.h:
+ * UIProcess/qt/WebPopupMenuProxyQt.h:
+ * WebProcess/WebProcess.h:
+
2012-07-24 Christophe Dumez <[email protected]>
[EFL][WK2] Remove unneeded WebURLRequestEfl and WebURLResponseEfl
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (123455 => 123456)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -43,7 +43,9 @@
#elif PLATFORM(WIN)
#include <string>
#elif PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QSocketNotifier;
+QT_END_NAMESPACE
#endif
#if PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
Modified: trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h (123455 => 123456)
--- trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -28,7 +28,9 @@
#define PlatformProcessIdentifier_h
#if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QProcess;
+QT_END_NAMESPACE
#elif PLATFORM(EFL)
#include <unistd.h>
#endif
Modified: trunk/Source/WebKit2/Platform/WorkQueue.h (123455 => 123456)
--- trunk/Source/WebKit2/Platform/WorkQueue.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/Platform/WorkQueue.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -47,8 +47,10 @@
#if PLATFORM(QT) && !OS(DARWIN)
#include <QSocketNotifier>
+QT_BEGIN_NAMESPACE
class QObject;
class QThread;
+QT_END_NAMESPACE
#elif PLATFORM(GTK)
#include <wtf/gobject/GRefPtr.h>
typedef gboolean (*GSourceFunc) (gpointer data);
Modified: trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.h (123455 => 123456)
--- trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -34,8 +34,10 @@
class ArgumentDecoder;
};
+QT_BEGIN_NAMESPACE
class QNetworkRequest;
class QNetworkReply;
+QT_END_NAMESPACE
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/qt/WebEventFactoryQt.h (123455 => 123456)
--- trunk/Source/WebKit2/Shared/qt/WebEventFactoryQt.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/Shared/qt/WebEventFactoryQt.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -29,6 +29,8 @@
#include "WebEvent.h"
+QT_BEGIN_NAMESPACE
+
#if ENABLE(TOUCH_EVENTS)
class QTouchEvent;
#endif
@@ -37,6 +39,8 @@
class QWheelEvent;
class QKeyEvent;
+QT_END_NAMESPACE
+
namespace WebKit {
class WebEventFactory {
Modified: trunk/Source/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -29,7 +29,9 @@
// a Qt specific WKNativeEvent.h file is needed because that the use of __APPLE__
// in original WKNativeEvent.h file breaks Qt build in MacOS
+QT_BEGIN_NAMESPACE
class QEvent;
+QT_END_NAMESPACE
typedef const QEvent* WKNativeEventPtr;
#endif /* WKNativeEvent_h */
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -27,8 +27,10 @@
#include <QtQuick/qquickitem.h>
#include <private/qquickflickable_p.h>
+QT_BEGIN_NAMESPACE
+class QQmlComponent;
+QT_END_NAMESPACE
class QWebNavigationRequest;
-class QQmlComponent;
class QQuickWebPage;
class QQuickWebViewAttached;
class QWebLoadRequest;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -33,11 +33,13 @@
#include <QVariant>
#include <QtQml/qqml.h>
+QT_BEGIN_NAMESPACE
class QAbstractListModel;
+class QString;
+class QUrl;
+QT_END_NAMESPACE
class QWebNavigationHistoryPrivate;
class QWebNavigationListModelPrivate;
-class QUrl;
-class QString;
class QWEBKIT_EXPORT QWebNavigationListModel : public QAbstractListModel {
Q_OBJECT
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -32,6 +32,7 @@
#include <WebKit2/WKPageGroup.h>
#include <wtf/Platform.h>
+QT_BEGIN_NAMESPACE
class QRect;
class QRectF;
class QPoint;
@@ -43,6 +44,7 @@
class QUrl;
class QMatrix4x4;
class QCursor;
+QT_END_NAMESPACE
class QRawWebViewPrivate;
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -36,7 +36,9 @@
#include <wtf/Noncopyable.h>
#if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QPainter;
+QT_END_NAMESPACE
#elif PLATFORM(GTK)
typedef struct _cairo cairo_t;
#endif
Modified: trunk/Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ThreadLauncher.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -32,7 +32,9 @@
#include <wtf/Threading.h>
#if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QLocalSocket;
+QT_END_NAMESPACE
#endif
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -36,7 +36,9 @@
#include <wtf/Functional.h>
#include <wtf/HashSet.h>
+QT_BEGIN_NAMESPACE
class QSGNode;
+QT_END_NAMESPACE
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -31,11 +31,12 @@
QT_BEGIN_NAMESPACE
class QPointF;
-class QQuickWebPage;
-class QQuickWebView;
class QWheelEvent;
QT_END_NAMESPACE
+class QQuickWebPage;
+class QQuickWebView;
+
class QWebKitTest;
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -24,7 +24,9 @@
#include <QtQuick/QSGTransformNode>
#include <wtf/PassRefPtr.h>
+QT_BEGIN_NAMESPACE
class QSGSimpleRectNode;
+QT_END_NAMESPACE
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -25,9 +25,12 @@
#include <QtCore/QObject>
#include <wtf/OwnPtr.h>
+QT_BEGIN_NAMESPACE
class QQmlComponent;
class QQmlContext;
class QQuickItem;
+QT_END_NAMESPACE
+
class QQuickWebView;
namespace WebCore {
Modified: trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -26,8 +26,10 @@
#include <WebKit2/WKGeolocationPosition.h>
#include <WebKit2/WKRetainPtr.h>
+QT_BEGIN_NAMESPACE
class QGeoPositionInfoSource;
class QGeoPositionInfo;
+QT_END_NAMESPACE
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h (123455 => 123456)
--- trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -31,11 +31,14 @@
#include <QtCore/QObject>
#include <wtf/OwnPtr.h>
+QT_BEGIN_NAMESPACE
class QQmlComponent;
class QQmlContext;
-class QQuickWebView;
class QQuickItem;
+QT_END_NAMESPACE
+class QQuickWebView;
+
namespace WebKit {
class WebPopupMenuProxyQt : public QObject, public WebPopupMenuProxy {
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (123455 => 123456)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -50,7 +50,9 @@
#endif
#if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QNetworkAccessManager;
+QT_END_NAMESPACE
#endif
#if PLATFORM(MAC)
Modified: trunk/Tools/ChangeLog (123455 => 123456)
--- trunk/Tools/ChangeLog 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Tools/ChangeLog 2012-07-24 11:33:43 UTC (rev 123456)
@@ -1,3 +1,12 @@
+2012-07-23 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Fix compilation against namespaced Qt
+
+ Reviewed by Simon Hausmann.
+
+ * QtTestBrowser/launcherwindow.h:
+ * WebKitTestRunner/PlatformWebView.h:
+
2012-07-24 Peter Beverloo <[email protected]>
Update a few Chromium Android contributors in committers.py
Modified: trunk/Tools/QtTestBrowser/launcherwindow.h (123455 => 123456)
--- trunk/Tools/QtTestBrowser/launcherwindow.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Tools/QtTestBrowser/launcherwindow.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -59,8 +59,10 @@
#include "webpage.h"
#include "webview.h"
+QT_BEGIN_NAMESPACE
class QPropertyAnimation;
class QLineEdit;
+QT_END_NAMESPACE
class WindowOptions {
public:
Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (123455 => 123456)
--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2012-07-24 11:23:03 UTC (rev 123455)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2012-07-24 11:33:43 UTC (rev 123456)
@@ -29,11 +29,13 @@
#include <WebKit2/WKRetainPtr.h>
#if defined(BUILDING_QT__)
+QT_BEGIN_NAMESPACE
+class QQuickView;
+class QEventLoop;
+QT_END_NAMESPACE
class QQuickWebView;
typedef QQuickWebView* PlatformWKView;
-class QQuickView;
typedef QQuickView* PlatformWindow;
-class QEventLoop;
#elif defined(__APPLE__) && __APPLE__
#if __OBJC__
@class WKView;