[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ossy at webkit.org
ossy at webkit.org
Mon Feb 21 00:23:08 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit dcd3ca68000d77392decdb07155cd3ce243053c9
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 30 13:21:39 2011 +0000
Unreviewed.
[Qt][WK2] Buildfix.
Source/WebKit2:
* UIProcess/API/qt/qwkhistory.h:
* UIProcess/API/qt/qwkpage.h:
Tools:
* MiniBrowser/qt/MiniBrowser.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77088 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d1b0bc6..c459588 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-30 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed.
+
+ [Qt][WK2] Buildfix.
+
+ * UIProcess/API/qt/qwkhistory.h:
+ * UIProcess/API/qt/qwkpage.h:
+
2011-01-29 Maciej Stachowiak <mjs at apple.com>
Reviewed by Geoffrey Garen.
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkhistory.h b/Source/WebKit2/UIProcess/API/qt/qwkhistory.h
index 81081c9..678466d 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkhistory.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkhistory.h
@@ -25,6 +25,7 @@
#ifndef qwkhistory_h
#define qwkhistory_h
+#include "config.h"
#include "qwebkitglobal.h"
#include <QObject>
#include <QSharedData>
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.h b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
index cb7933a..e57684f 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -1,6 +1,7 @@
#ifndef qwkpage_h
#define qwkpage_h
+#include "config.h"
#include "qwebkitglobal.h"
#include <QAction>
#include <QObject>
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 03e59cb..2383d35 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-30 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed.
+
+ [Qt][WK2] Buildfix.
+
+ * MiniBrowser/qt/MiniBrowser.pro:
+
2011-01-28 Simon Fraser <simon.fraser at apple.com>
Reviewed by Adam Roben.
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index 84bbb33..8b60405 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -16,6 +16,7 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
include(../../../Source/WebKit.pri)
INCLUDEPATH += \
+ $$PWD/../../../Source/JavaScriptCore \
$$PWD/../../../Source/WebKit2/ \
$$PWD/../../../Source/WebKit2/UIProcess/API/cpp \
$$PWD/../../../Source/WebKit2/UIProcess/API/C \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list