[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
kent.hansen at nokia.com
kent.hansen at nokia.com
Fri Jan 21 14:45:37 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 09f5ab6fbe2e7af3342a27f5a08137050c39af7e
Author: kent.hansen at nokia.com <kent.hansen at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 29 13:39:37 2010 +0000
2010-12-29 Kent Hansen <kent.hansen at nokia.com>
Reviewed by Simon Hausmann.
[Qt] Fix compilation with Qt in namespace
https://bugs.webkit.org/show_bug.cgi?id=51701
* QtTestBrowser/webview.h:
2010-12-29 Kent Hansen <kent.hansen at nokia.com>
Reviewed by Simon Hausmann.
[Qt] Fix compilation with Qt in namespace
https://bugs.webkit.org/show_bug.cgi?id=51701
* platform/graphics/ContextShadow.h:
* platform/graphics/GraphicsContext3D.h:
* platform/network/NetworkingContext.h:
* platform/network/qt/QtNAMThreadSafeProxy.h:
* plugins/PluginView.h:
2010-12-29 Kent Hansen <kent.hansen at nokia.com>
Reviewed by Simon Hausmann.
[Qt] Fix compilation with Qt in namespace
https://bugs.webkit.org/show_bug.cgi?id=51701
* Api/qwebkitplatformplugin.h:
* WebCoreSupport/InspectorServerQt.h:
* tests/hybridPixmap/widget.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74741 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b3a6d02..3003f18 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-29 Kent Hansen <kent.hansen at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Fix compilation with Qt in namespace
+ https://bugs.webkit.org/show_bug.cgi?id=51701
+
+ * QtTestBrowser/webview.h:
+
2010-12-28 Daniel Bates <dbates at rim.com>
Reviewed by Sam Weinig.
diff --git a/Tools/QtTestBrowser/webview.h b/Tools/QtTestBrowser/webview.h
index 240ea89..b50b764 100644
--- a/Tools/QtTestBrowser/webview.h
+++ b/Tools/QtTestBrowser/webview.h
@@ -41,7 +41,9 @@
#include <QGraphicsWidget>
#include <QTime>
+QT_BEGIN_NAMESPACE
class QStateMachine;
+QT_END_NAMESPACE
class WebViewTraditional : public QWebView {
Q_OBJECT
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 11a89e0..a5dd527 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-29 Kent Hansen <kent.hansen at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Fix compilation with Qt in namespace
+ https://bugs.webkit.org/show_bug.cgi?id=51701
+
+ * platform/graphics/ContextShadow.h:
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/network/NetworkingContext.h:
+ * platform/network/qt/QtNAMThreadSafeProxy.h:
+ * plugins/PluginView.h:
+
2010-12-28 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/graphics/ContextShadow.h b/WebCore/platform/graphics/ContextShadow.h
index a4c3f00..e5e5a8e 100644
--- a/WebCore/platform/graphics/ContextShadow.h
+++ b/WebCore/platform/graphics/ContextShadow.h
@@ -41,7 +41,9 @@ typedef struct _cairo cairo_t;
typedef struct _cairo_surface cairo_surface_t;
#elif PLATFORM(QT)
#include <QImage>
+QT_BEGIN_NAMESPACE
class QPainter;
+QT_END_NAMESPACE
#endif
namespace WebCore {
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index edce5e5..8720fdb 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -56,8 +56,10 @@ typedef void* CALayer;
typedef void* WebGLLayer;
#endif
#elif PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QPainter;
class QRect;
+QT_END_NAMESPACE
typedef void* PlatformGraphicsContext3D;
const PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
typedef int Platform3DObject;
diff --git a/WebCore/platform/network/NetworkingContext.h b/WebCore/platform/network/NetworkingContext.h
index e0cb4c5..e8a3776 100644
--- a/WebCore/platform/network/NetworkingContext.h
+++ b/WebCore/platform/network/NetworkingContext.h
@@ -27,8 +27,10 @@
#endif
#if PLATFORM(QT)
+QT_BEGIN_NAMESPACE
class QObject;
class QNetworkAccessManager;
+QT_END_NAMESPACE
#endif
namespace WebCore {
diff --git a/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h b/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h
index 3e0c189..a2fa4ee 100644
--- a/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h
+++ b/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h
@@ -25,9 +25,11 @@
#include <QNetworkReply>
#include <QObject>
+QT_BEGIN_NAMESPACE
class QNetworkAccessManager;
class QNetworkRequest;
class QUrl;
+QT_END_NAMESPACE
namespace WebCore {
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index deaec99..044d6e2 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -60,7 +60,9 @@ typedef PlatformWidget PlatformPluginWidget;
#if PLATFORM(QT)
#include <QGraphicsItem>
#include <QImage>
+QT_BEGIN_NAMESPACE
class QPainter;
+QT_END_NAMESPACE
#endif
#if USE(JSC)
diff --git a/WebKit/qt/Api/qwebkitplatformplugin.h b/WebKit/qt/Api/qwebkitplatformplugin.h
index 2ceaac1..b8cc984 100644
--- a/WebKit/qt/Api/qwebkitplatformplugin.h
+++ b/WebKit/qt/Api/qwebkitplatformplugin.h
@@ -131,6 +131,8 @@ public:
virtual QObject* createExtension(Extension extension) const = 0;
};
+QT_BEGIN_NAMESPACE
Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.6");
+QT_END_NAMESPACE
#endif // QWEBKITPLATFORMPLUGIN_H
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9d93dbd..ab78e0c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-29 Kent Hansen <kent.hansen at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Fix compilation with Qt in namespace
+ https://bugs.webkit.org/show_bug.cgi?id=51701
+
+ * Api/qwebkitplatformplugin.h:
+ * WebCoreSupport/InspectorServerQt.h:
+ * tests/hybridPixmap/widget.h:
+
2010-12-23 Jan Erik Hanssen <jhanssen at sencha.com>
Reviewed by Alexey Proskuryakov.
diff --git a/WebKit/qt/WebCoreSupport/InspectorServerQt.h b/WebKit/qt/WebCoreSupport/InspectorServerQt.h
index 74e8c2f..922b63e 100644
--- a/WebKit/qt/WebCoreSupport/InspectorServerQt.h
+++ b/WebKit/qt/WebCoreSupport/InspectorServerQt.h
@@ -27,8 +27,10 @@
#include <QString>
#include <wtf/Forward.h>
+QT_BEGIN_NAMESPACE
class QTcpServer;
class QTcpSocket;
+QT_END_NAMESPACE
class QWebPage;
namespace WebCore {
diff --git a/WebKit/qt/tests/hybridPixmap/widget.h b/WebKit/qt/tests/hybridPixmap/widget.h
index a49f8ba..2ac8a06 100644
--- a/WebKit/qt/tests/hybridPixmap/widget.h
+++ b/WebKit/qt/tests/hybridPixmap/widget.h
@@ -27,9 +27,11 @@
typedef QWebView WebView;
+QT_BEGIN_NAMESPACE
namespace Ui {
class Widget;
}
+QT_END_NAMESPACE
class Widget : public QWidget {
Q_OBJECT
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list