[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:58:01 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b2291255f20c0fa7f3e03bbe44bebb53b22bfbea
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 26 14:34:56 2009 +0000
2009-11-26 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Corrects build break on Windows.
Rename platform/text/qt/TextBoundaries.cpp to TextBoundariesQt.cpp since
platform/text/TextBoundaries.cpp was compiled instead when compiling with nmake.
* WebCore.pro:
* platform/text/qt/TextBoundariesQt.cpp: Renamed from WebCore/platform/text/qt/TextBoundaries.cpp.
(WebCore::findNextWordFromIndex):
(WebCore::findWordBoundary):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51414 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4b54cce..0857df9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-26 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Corrects build break on Windows.
+
+ Rename platform/text/qt/TextBoundaries.cpp to TextBoundariesQt.cpp since
+ platform/text/TextBoundaries.cpp was compiled instead when compiling with nmake.
+
+ * WebCore.pro:
+ * platform/text/qt/TextBoundariesQt.cpp: Renamed from WebCore/platform/text/qt/TextBoundaries.cpp.
+ (WebCore::findNextWordFromIndex):
+ (WebCore::findWordBoundary):
+
2009-11-26 Anton Muhin <antonm at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index a604c0c..834ead8 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2406,7 +2406,7 @@ SOURCES += \
platform/qt/LoggingQt.cpp \
platform/text/qt/StringQt.cpp \
platform/qt/TemporaryLinkStubs.cpp \
- platform/text/qt/TextBoundaries.cpp \
+ platform/text/qt/TextBoundariesQt.cpp \
platform/text/qt/TextBreakIteratorQt.cpp \
platform/text/qt/TextCodecQt.cpp \
platform/qt/WheelEventQt.cpp \
diff --git a/WebCore/platform/text/qt/TextBoundaries.cpp b/WebCore/platform/text/qt/TextBoundariesQt.cpp
similarity index 100%
rename from WebCore/platform/text/qt/TextBoundaries.cpp
rename to WebCore/platform/text/qt/TextBoundariesQt.cpp
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list