Skip to content
Permalink
Browse files
[Qt] Fix compilation against namespaced Qt
Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-07-23
Reviewed by Simon Hausmann.

Source/WebCore:

* platform/graphics/Font.h:
* platform/network/ResourceHandleInternal.h:
* platform/qt/ThirdPartyCookiesQt.h:

Source/WebKit/qt:

* WebCoreSupport/GeolocationClientQt.h:
* examples/platformplugin/WebPlugin.h:

Source/WebKit2:

* 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:

Tools:

* QtTestBrowser/launcherwindow.h:
* WebKitTestRunner/PlatformWebView.h:

Canonical link: https://commits.webkit.org/109906@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@123456 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
ossilator authored and tronical committed Jul 24, 2012
1 parent f9eb5c9 commit 6847e15f7c697911f7bddb5225f33df7ca8bf226
Showing 29 changed files with 114 additions and 8 deletions.
@@ -1,3 +1,13 @@
2012-07-23 Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

[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 <ascian@rim.com>

Web Inspector [JSC]: Enable initiator column in network panel.
@@ -38,7 +38,9 @@
#if PLATFORM(QT)
#if HAVE(QRAWFONT)
#include <QRawFont>
QT_BEGIN_NAMESPACE
class QTextLayout;
QT_END_NAMESPACE
#else
#include <QFont>
#endif
@@ -54,7 +54,9 @@ class Frame;
#endif

#if PLATFORM(QT)
QT_BEGIN_NAMESPACE
class QWebNetworkJob;
QT_END_NAMESPACE
namespace WebCore {
class QNetworkReplyHandler;
}
@@ -20,8 +20,10 @@
#ifndef ThirdPartyCookiesQt_h
#define ThirdPartyCookiesQt_h

QT_BEGIN_NAMESPACE
class QNetworkCookieJar;
class QUrl;
QT_END_NAMESPACE

namespace WebCore {
class NetworkingContext;
@@ -1,3 +1,12 @@
2012-07-23 Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

[Qt] Fix compilation against namespaced Qt

Reviewed by Simon Hausmann.

* WebCoreSupport/GeolocationClientQt.h:
* examples/platformplugin/WebPlugin.h:

2012-07-23 Pierre Rossi <pierre.rossi@gmail.com>

Unify numTouchEventHandlersChanged and needTouchEvents in the chrome client
@@ -39,7 +39,9 @@ class QGeoPositionInfoSource;
using namespace QtMobility;
#elif HAVE(QT5)
#include <QtLocation/QGeoPositionInfo>
QT_BEGIN_NAMESPACE
class QGeoPositionInfoSource;
QT_END_NAMESPACE
#endif


@@ -28,8 +28,10 @@
#include <QVideoWidget>
#endif

QT_BEGIN_NAMESPACE
class QListWidgetItem;
class QListWidget;
QT_END_NAMESPACE

class Popup : public QDialog {
Q_OBJECT
@@ -1,3 +1,28 @@
2012-07-23 Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

[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 <christophe.dumez@intel.com>

[EFL][WK2] Remove unneeded WebURLRequestEfl and WebURLResponseEfl
@@ -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)
@@ -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
@@ -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);
@@ -34,8 +34,10 @@ class ArgumentEncoder;
class ArgumentDecoder;
};

QT_BEGIN_NAMESPACE
class QNetworkRequest;
class QNetworkReply;
QT_END_NAMESPACE

namespace WebKit {

@@ -29,6 +29,8 @@

#include "WebEvent.h"

QT_BEGIN_NAMESPACE

#if ENABLE(TOUCH_EVENTS)
class QTouchEvent;
#endif
@@ -37,6 +39,8 @@ class QMouseEvent;
class QWheelEvent;
class QKeyEvent;

QT_END_NAMESPACE

namespace WebKit {

class WebEventFactory {
@@ -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 */
@@ -27,8 +27,10 @@
#include <QtQuick/qquickitem.h>
#include <private/qquickflickable_p.h>

class QWebNavigationRequest;
QT_BEGIN_NAMESPACE
class QQmlComponent;
QT_END_NAMESPACE
class QWebNavigationRequest;
class QQuickWebPage;
class QQuickWebViewAttached;
class QWebLoadRequest;
@@ -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
@@ -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 QTouchEvent;
class QUrl;
class QMatrix4x4;
class QCursor;
QT_END_NAMESPACE

class QRawWebViewPrivate;

@@ -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
@@ -32,7 +32,9 @@
#include <wtf/Threading.h>

#if PLATFORM(QT)
QT_BEGIN_NAMESPACE
class QLocalSocket;
QT_END_NAMESPACE
#endif

namespace WebKit {
@@ -36,7 +36,9 @@
#include <wtf/Functional.h>
#include <wtf/HashSet.h>

QT_BEGIN_NAMESPACE
class QSGNode;
QT_END_NAMESPACE

namespace WebKit {

@@ -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 {
@@ -24,7 +24,9 @@
#include <QtQuick/QSGTransformNode>
#include <wtf/PassRefPtr.h>

QT_BEGIN_NAMESPACE
class QSGSimpleRectNode;
QT_END_NAMESPACE

namespace WebKit {

@@ -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 {
@@ -26,8 +26,10 @@
#include <WebKit2/WKGeolocationPosition.h>
#include <WebKit2/WKRetainPtr.h>

QT_BEGIN_NAMESPACE
class QGeoPositionInfoSource;
class QGeoPositionInfo;
QT_END_NAMESPACE

namespace WebKit {

@@ -31,10 +31,13 @@
#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 {

@@ -50,7 +50,9 @@
#endif

#if PLATFORM(QT)
QT_BEGIN_NAMESPACE
class QNetworkAccessManager;
QT_END_NAMESPACE
#endif

#if PLATFORM(MAC)
@@ -1,3 +1,12 @@
2012-07-23 Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

[Qt] Fix compilation against namespaced Qt

Reviewed by Simon Hausmann.

* QtTestBrowser/launcherwindow.h:
* WebKitTestRunner/PlatformWebView.h:

2012-07-24 Peter Beverloo <peter@chromium.org>

Update a few Chromium Android contributors in committers.py
@@ -59,8 +59,10 @@
#include "webpage.h"
#include "webview.h"

QT_BEGIN_NAMESPACE
class QPropertyAnimation;
class QLineEdit;
QT_END_NAMESPACE

class WindowOptions {
public:
@@ -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;

0 comments on commit 6847e15

Please sign in to comment.