2006-10-03 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed by Eric.

        build-webkit tweak: Use WebKitBuild/$config as output dir (Release/Debug).

        * Scripts/webkitdirs.pm:

2006-10-03  Nikolas Zimmermann  <zimmermann@kde.org>

        Reviewed by Eric.

        Fix Qt/Linux build.

        * CMakeLists.txt: Add counter related files.

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

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 5e20b73fb994bf5cc786780152c7c2c7870c3fee..e9d5431441a1471a5b4ac65469ddf6e9af74d493 100644 (file)
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1071,6 +1071,9 @@ set(WebCore_SRCS
     platform/GlyphMap.cpp
     platform/Font.cpp
     platform/FontData.cpp
+    rendering/RenderCounter.cpp
+    rendering/CounterNode.cpp
+    rendering/CounterResetNode.cpp
     rendering/RenderListBox.cpp
     rendering/RenderReplaced.cpp
     rendering/RenderPartObject.cpp

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61aeeb9bca791a33bc642aefc18e72bd7f296604..b24c8e61c0a2844b137f6001d2d7f000b991f01f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-03  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Eric.
+
+        Fix Qt/Linux build.
+
+        * CMakeLists.txt: Add counter related files.
+
 2006-10-03  Mark Rowe  <bdash@webkit.org>
 
         Reviewed by Eric.

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9ea0d48ed5abf8de2efb00af54da5c5ebce66412..0463bf62711286822e2c9d9589862f8a2a7c8879 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-03  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Eric.
+
+        build-webkit tweak: Use WebKitBuild/$config as output dir (Release/Debug).
+
+        * Scripts/webkitdirs.pm:
+
 2006-10-02  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed/landed by Adam.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 926bde63f40514d7bf13892b37d210771087b331..3e2ac4dcbb7ae088f927421c60d9bf5c65231ac8 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -397,12 +397,12 @@ sub buildCMakeProject($)
     }
 
     my $config = configuration();
-    print "Calling 'cmake -DCMAKE_BUILD_TYPE=$config ../' in " . baseProductDir() . " ...\n\n";
+    print "Calling 'cmake -DCMAKE_BUILD_TYPE=$config ../' in " . baseProductDir() . "/$config ...\n\n";
 
-    system "mkdir -p " . baseProductDir();
-    chdir baseProductDir() or die "Failed to cd into " . baseProductDir() . "\n";
+    system "mkdir -p " . baseProductDir() . "/$config";
+    chdir baseProductDir() . "/$config" or die "Failed to cd into " . baseProductDir() . "/$config \n";
 
-    my $result = system "cmake", "-DCMAKE_BUILD_TYPE=$config", "../";
+    my $result = system "cmake", "-DCMAKE_BUILD_TYPE=$config", "../../";
     if($result ne 0) {
        die "Failed to setup build environment using cmake!\n";
     }