[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 15:46:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1a01e60ad6450b192d2e2dc9d739098e420b1e9e
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 00:33:55 2010 +0000
[Qt] Unreviewed WebKit2 buildfix after r71587.
* UIProcess/qt/WebInspectorProxyQt.cpp:
* WebKit2.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71865 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5a15842..f3f3302 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-11 Csaba Osztrogonác <ossy at webkit.org>
+
+ [Qt] Unreviewed WebKit2 buildfix after r71587.
+
+ * UIProcess/qt/WebInspectorProxyQt.cpp:
+ * WebKit2.pro:
+
2010-11-11 Brian Weinstein <bweinstein at apple.com>
More Windows build fixing. Change another #import to a #include, and remove an unneeded
diff --git a/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp b/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp
index d760c1c..c2d857e 100644
--- a/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp
+++ b/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp
@@ -30,8 +30,6 @@
#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
#include "NotImplemented.h"
-using namespace WebCore;
-
namespace WebKit {
WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 27608a1..81c12ad 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -482,6 +482,7 @@ SOURCES += \
UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
UIProcess/qt/WebContextMenuProxyQt.cpp \
UIProcess/qt/WebContextQt.cpp \
+ UIProcess/qt/WebInspectorProxyQt.cpp \
UIProcess/qt/WebPopupMenuProxyQt.cpp \
WebProcess/Downloads/Download.cpp \
WebProcess/Downloads/DownloadManager.cpp \
@@ -543,11 +544,11 @@ SOURCES += \
WebProcess/WebPage/WebEditCommand.cpp \
WebProcess/WebPage/WebFrame.cpp \
WebProcess/WebPage/WebInspector.cpp \
+ WebProcess/WebPage/qt/WebInspectorQt.cpp \
WebProcess/WebPage/WebPage.cpp \
WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \
WebProcess/WebPage/qt/WebPageQt.cpp \
WebProcess/WebProcess.cpp \
- WebProcess/qt/WebInspectorQt.cpp \
WebProcess/qt/WebProcessMainQt.cpp \
WebProcess/qt/WebProcessQt.cpp \
$$WEBKIT2_GENERATED_SOURCES
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list