[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 13:20:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 61a4a2c633c0f9c2fa5b599016d00108862ea3c3
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 11 18:09:54 2010 +0000
2010-09-11 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Simon Hausmann.
Web Inspector: Include CString.h in generated files
This is necessary for generated code that uses the CString
returned by String::utf8() (from generateBackendDispatcher)
Chromium builds already get CString.h from KURLGooglePrivate.h
so this issue only occurs when building Qt against V8.
* inspector/CodeGeneratorInspector.pm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67305 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d4152ae..cd5f4a3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-11 Andreas Kling <andreas.kling at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ Web Inspector: Include CString.h in generated files
+
+ This is necessary for generated code that uses the CString
+ returned by String::utf8() (from generateBackendDispatcher)
+
+ Chromium builds already get CString.h from KURLGooglePrivate.h
+ so this issue only occurs when building Qt against V8.
+
+ * inspector/CodeGeneratorInspector.pm:
+
2010-09-11 Adele Peterson <adele at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index c7907b4..80e243b 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -606,6 +606,7 @@ sub generateSource
my @sourceContent = split("\r", $licenseTemplate);
push(@sourceContent, "\n#include \"config.h\"");
push(@sourceContent, "#include \"$className.h\"");
+ push(@sourceContent, "#include <wtf/text/CString.h>");
push(@sourceContent, "");
push(@sourceContent, "#if ENABLE(INSPECTOR)");
push(@sourceContent, "");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list