[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zoltan at webkit.org
zoltan at webkit.org
Wed Dec 22 12:08:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 48479df1aa1a6b44e066266ddb8b72d8d229f62c
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 09:21:00 2010 +0000
Unreviewed Qt WebKit2 build fix.
Patch by Balazs Kelemen <kb at inf.u-szeged.hu> on 2010-08-16
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::platformSetUpWebProcess): Added empty stub implementation.
* WebKit2.pro: Enumerate new files, include WebKit.pri for correct define macro set.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65403 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d1aa8de..e4c4e6e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-16 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Unreviewed Qt WebKit2 build fix.
+
+ * UIProcess/qt/WebContextQt.cpp:
+ (WebKit::WebContext::platformSetUpWebProcess): Added empty stub implementation.
+ * WebKit2.pro: Enumerate new files, include WebKit.pri for correct define macro set.
+
2010-08-15 Dan Bernstein <mitz at apple.com>
Revised build fix from r65363 based on suggestion from Darin Adler.
diff --git a/WebKit2/UIProcess/qt/WebContextQt.cpp b/WebKit2/UIProcess/qt/WebContextQt.cpp
index 26e692e..d0ef335 100644
--- a/WebKit2/UIProcess/qt/WebContextQt.cpp
+++ b/WebKit2/UIProcess/qt/WebContextQt.cpp
@@ -35,4 +35,8 @@ WTF::String WebContext::applicationCacheDirectory()
return WebCore::cacheStorage().cacheDirectory();
}
+void WebContext::platformSetUpWebProcess()
+{
+}
+
} // namespace WebKit
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 4ce32b2..7476168 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -3,6 +3,7 @@
CONFIG += building-libs
CONFIG += depend_includepath
+include($$PWD/../WebKit.pri)
include($$PWD/../common.pri)
include($$PWD/../WebCore/features.pri)
include(WebKit2.pri)
@@ -155,6 +156,8 @@ HEADERS += \
Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
Shared/CoreIPCSupport/WebProcessMessageKinds.h \
Shared/DrawingAreaBase.h \
+ Shared/ImmutableArray.h \
+ Shared/ImmutableDictionary.h \
Shared/NotImplemented.h \
Shared/qt/WebEventFactoryQt.h \
Shared/VisitedLinkTable.h \
@@ -194,6 +197,9 @@ HEADERS += \
UIProcess/VisitedLinkProvider.h \
UIProcess/WebContext.h \
UIProcess/WebContextInjectedBundleClient.h \
+ UIProcess/WebFormClient.h \
+ UIProcess/WebFormSubmissionListenerProxy.h \
+ UIProcess/WebFrameListenerProxy.h \
UIProcess/WebFramePolicyListenerProxy.h \
UIProcess/WebFrameProxy.h \
UIProcess/WebHistoryClient.h \
@@ -255,6 +261,7 @@ SOURCES += \
Platform/qt/WorkQueueQt.cpp \
Shared/DrawingAreaBase.cpp \
Shared/ImmutableArray.cpp \
+ Shared/ImmutableDictionary.cpp \
Shared/VisitedLinkTable.cpp \
Shared/WebEventConversion.cpp \
Shared/WebPreferencesStore.cpp \
@@ -286,6 +293,9 @@ SOURCES += \
UIProcess/WebBackForwardListItem.cpp \
UIProcess/WebContext.cpp \
UIProcess/WebContextInjectedBundleClient.cpp \
+ UIProcess/WebFormClient.cpp \
+ UIProcess/WebFormSubmissionListenerProxy.cpp \
+ UIProcess/WebFrameListenerProxy.cpp \
UIProcess/WebFramePolicyListenerProxy.cpp \
UIProcess/WebFrameProxy.cpp \
UIProcess/WebHistoryClient.cpp \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list