Title: [95542] trunk/Source
- Revision
- 95542
- Author
- [email protected]
- Date
- 2011-09-20 07:57:38 -0700 (Tue, 20 Sep 2011)
Log Message
Source/WebCore: [Qt][Mac] Buildfix after r95513.
Forwarding headers for WebCore should be generated based on WebCore sources instead of WebKit2.
Rubber-stamped by Andras Becsi.
* DerivedSources.pro:
* WebCore.pro: Add platform/mac/DisplaySleepDisabler.cpp to SOURCES.
Source/WebKit2: [Qt][Mac] Buildfix after r95513.
Rubber-stamped by Andras Becsi.
* Scripts/generate-forwarding-headers.pl: Add mm file supporting.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95541 => 95542)
--- trunk/Source/WebCore/ChangeLog 2011-09-20 14:22:58 UTC (rev 95541)
+++ trunk/Source/WebCore/ChangeLog 2011-09-20 14:57:38 UTC (rev 95542)
@@ -1,3 +1,13 @@
+2011-09-20 Csaba Osztrogonác <[email protected]>
+
+ [Qt][Mac] Buildfix after r95513.
+ Forwarding headers for WebCore should be generated based on WebCore sources instead of WebKit2.
+
+ Rubber-stamped by Andras Becsi.
+
+ * DerivedSources.pro:
+ * WebCore.pro: Add platform/mac/DisplaySleepDisabler.cpp to SOURCES.
+
2011-09-19 Pavel Feldman <[email protected]>
Web Inspector: document Debugger.paused, introduce types for ids in Debugger domain.
Modified: trunk/Source/WebCore/DerivedSources.pro (95541 => 95542)
--- trunk/Source/WebCore/DerivedSources.pro 2011-09-20 14:22:58 UTC (rev 95541)
+++ trunk/Source/WebCore/DerivedSources.pro 2011-09-20 14:57:38 UTC (rev 95542)
@@ -29,7 +29,7 @@
mac {
SRC_ROOT_DIR = $$replace(PWD, /Source/WebCore, "")
- fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebKit2 ../include mac
+ fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebCore ../include mac
fwheader_generator.depends = $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl
generated_files.depends += fwheader_generator
QMAKE_EXTRA_TARGETS += fwheader_generator
Modified: trunk/Source/WebCore/WebCore.pro (95541 => 95542)
--- trunk/Source/WebCore/WebCore.pro 2011-09-20 14:22:58 UTC (rev 95541)
+++ trunk/Source/WebCore/WebCore.pro 2011-09-20 14:57:38 UTC (rev 95542)
@@ -3063,6 +3063,7 @@
platform/mac/WebWindowAnimation.h
SOURCES += \
+ platform/mac/DisplaySleepDisabler.cpp \
platform/graphics/cg/IntRectCG.cpp \
platform/graphics/cg/FloatSizeCG.cpp \
platform/cf/SharedBufferCF.cpp \
Modified: trunk/Source/WebKit2/ChangeLog (95541 => 95542)
--- trunk/Source/WebKit2/ChangeLog 2011-09-20 14:22:58 UTC (rev 95541)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-20 14:57:38 UTC (rev 95542)
@@ -1,3 +1,11 @@
+2011-09-20 Csaba Osztrogonác <[email protected]>
+
+ [Qt][Mac] Buildfix after r95513.
+
+ Rubber-stamped by Andras Becsi.
+
+ * Scripts/generate-forwarding-headers.pl: Add mm file supporting.
+
2011-09-20 Gopal Raghavan <[email protected]>
[Qt] QDesktopWebView missing loadProgress tests
Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (95541 => 95542)
--- trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2011-09-20 14:22:58 UTC (rev 95541)
+++ trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2011-09-20 14:57:38 UTC (rev 95542)
@@ -64,7 +64,7 @@
sub collectNeededHeaders {
my $filePath = $File::Find::name;
my $file = $_;
- if ($filePath =~ '\.h$|\.cpp$|\.c$') {
+ if ($filePath =~ '\.h$|\.cpp$|\.c$|\.mm$') {
open(FILE, "<$file") or die "Could not open $filePath.\n";
while (<FILE>) {
if (m/^#.*<$framework\/(.*\.h)/) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
