[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jpetsovits at rim.com
jpetsovits at rim.com
Wed Dec 22 14:12:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 30386a501d31c3db2c763bd456932dc2055b2290
Author: jpetsovits at rim.com <jpetsovits at rim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 5 15:52:25 2010 +0000
2010-10-05 Jakob Petsovits <jpetsovits at rim.com>
Reviewed by Andreas Kling.
[Qt] Make build work with QT_NO_CURSOR
https://bugs.webkit.org/show_bug.cgi?id=46097
Add a missing semicolon.
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::setCursor):
2010-10-05 Jakob Petsovits <jpetsovits at rim.com>
Reviewed by Andreas Kling.
[Qt] Make build work with QT_NO_CURSOR
https://bugs.webkit.org/show_bug.cgi?id=46097
Add a missing include.
* platform/qt/QWebPageClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69111 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6addb9f..fdb42c8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -5,6 +5,17 @@
[Qt] Make build work with QT_NO_CURSOR
https://bugs.webkit.org/show_bug.cgi?id=46097
+ Add a missing include.
+
+ * platform/qt/QWebPageClient.h:
+
+2010-10-05 Jakob Petsovits <jpetsovits at rim.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Make build work with QT_NO_CURSOR
+ https://bugs.webkit.org/show_bug.cgi?id=46097
+
createCustomCursor() is a static function and not used
in that file if QT_NO_CURSOR is defined, so rather than
making it return 0, it should not exist altogether.
diff --git a/WebCore/platform/qt/QWebPageClient.h b/WebCore/platform/qt/QWebPageClient.h
index 9301cd5..f5d8c1b 100644
--- a/WebCore/platform/qt/QWebPageClient.h
+++ b/WebCore/platform/qt/QWebPageClient.h
@@ -30,6 +30,7 @@
#include <QCursor>
#endif
+#include <QPalette>
#include <QRect>
QT_BEGIN_NAMESPACE
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f14f200..41aad33 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-05 Jakob Petsovits <jpetsovits at rim.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Make build work with QT_NO_CURSOR
+ https://bugs.webkit.org/show_bug.cgi?id=46097
+
+ Add a missing semicolon.
+
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore::ChromeClientQt::setCursor):
+
2010-10-05 Simon Hausmann <simon.hausmann at nokia.com>
Unreviewed build fix.
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index b38ce09..3bcc8f8 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -566,7 +566,7 @@ void ChromeClientQt::setCursor(const Cursor& cursor)
return;
pageClient->setCursor(*cursor.platformCursor());
#else
- UNUSED_PARAM(cursor)
+ UNUSED_PARAM(cursor);
#endif
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list