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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95542 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 903faba..979c030 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-09-20  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [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  <pfeldman@google.com>
 
         Web Inspector: document Debugger.paused, introduce types for ids in Debugger domain.

diff --git a/Source/WebCore/DerivedSources.pro b/Source/WebCore/DerivedSources.pro
index a5e20a9..173294b 100644 (file)
--- a/Source/WebCore/DerivedSources.pro
+++ b/Source/WebCore/DerivedSources.pro
@@ -29,7 +29,7 @@ defineTest(addExtraCompiler) {
 
 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

diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index dfd2c00..438e389 100644 (file)
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -3063,6 +3063,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
             platform/mac/WebWindowAnimation.h
 
         SOURCES += \
+            platform/mac/DisplaySleepDisabler.cpp \
             platform/graphics/cg/IntRectCG.cpp \
             platform/graphics/cg/FloatSizeCG.cpp \
             platform/cf/SharedBufferCF.cpp \

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 4091361..c29d0b5 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-20  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt][Mac] Buildfix after r95513.
+
+        Rubber-stamped by Andras Becsi.
+
+        * Scripts/generate-forwarding-headers.pl: Add mm file supporting.
+
 2011-09-20  Gopal Raghavan  <gopal.1.raghavan@nokia.com>
 
         [Qt] QDesktopWebView missing loadProgress tests

diff --git a/Source/WebKit2/Scripts/generate-forwarding-headers.pl b/Source/WebKit2/Scripts/generate-forwarding-headers.pl
index 96c25da..cbdfc99 100755 (executable)
--- a/Source/WebKit2/Scripts/generate-forwarding-headers.pl
+++ b/Source/WebKit2/Scripts/generate-forwarding-headers.pl
@@ -64,7 +64,7 @@ foreach (@frameworks) {
 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)/) {