2006-09-02 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed by hyatt.  Landed by eseidel.

        Fix build on Linux.

        * CMakeLists.txt: Add platform/CString.cpp.
        * platform/qt/FrameQt.cpp: Correct repsondToChangedContents() signature
        * platform/qt/FrameQt.h:: Correct respondToChangedContents() signature

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8d7ede8448d9f0d28741d067a98315e32b8d5886..a9eea188754141a527a0cfd5e7419a9a9877064b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-01  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by hyatt.  Landed by eseidel.
+
+        Fix build on Linux.
+
+        * pcre/CMakeLists.txt: Add wtf/ include.
+
 2006-09-01  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed and landed by ap.

diff --git a/JavaScriptCore/pcre/CMakeLists.txt b/JavaScriptCore/pcre/CMakeLists.txt
index 61edc87530e1070cd612fd7045c3ce3960ff9c14..d346123536a9c1b1fb2cb6b34da18cd75fb659a0 100644 (file)
--- a/JavaScriptCore/pcre/CMakeLists.txt
+++ b/JavaScriptCore/pcre/CMakeLists.txt
@@ -1,8 +1,7 @@
 
 project( pcre-unity )
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../wtf )
 #compile dftables.c -> dftables
 #run dftables to generate chartables.c
 

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index f423e644c3f16ea0af058fe6937477d726f94ba5..9caf6d0c6a53be3f8064f61763ffb6fe140d1da5 100644 (file)
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -207,7 +207,7 @@ set(WebCore-unity-IDLGeneratedSources )
 foreach (idl ${IDL_BINDINGS})
    get_filename_component(_basename ${idl} NAME_WE)
    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.cpp ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.h
-      COMMAND perl -I${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts ${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts/generate-bindings.pl  --defines \"SVG_SUPPORT=${WEBKIT_USE_SVG_SUPPORT}\" --generator JS --include dom --include html --include xml --include ksvg2/svg --outputdir ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${idl}
+      COMMAND perl -I${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts ${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts/generate-bindings.pl  --defines \"SVG_SUPPORT=${WEBKIT_USE_SVG_SUPPORT}\" --generator JS --include ${CMAKE_SOURCE_DIR}/WebCore/dom --include ${CMAKE_SOURCE_DIR}/WebCore/html --include ${CMAKE_SOURCE_DIR}/WebCore/xml --include ${CMAKE_SOURCE_DIR}/WebCore/ksvg2/svg --outputdir ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${idl}
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${idl} )
    set(WebCore-unity-IDLGeneratedSources ${WebCore-unity-IDLGeneratedSources} ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.cpp ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.h )
 endforeach (idl)
@@ -834,6 +834,7 @@ set(WebCore_SRCS
     loader/Cache.cpp
     loader/Decoder.cpp
     loader/FormData.cpp
+    platform/CString.cpp
     platform/AtomicString.cpp
     platform/AffineTransform.cpp
     platform/TextStream.cpp

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82aa947dad72983c9e067f97dffa5be242c04df3..022da16d7623b97556d41f51edf8f505e575d11a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-02  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by hyatt.  Landed by eseidel.
+
+        Fix build on Linux.
+
+        * CMakeLists.txt: Add platform/CString.cpp.
+        * platform/qt/FrameQt.cpp: Correct repsondToChangedContents() signature
+        * platform/qt/FrameQt.h:: Correct respondToChangedContents() signature
+
 2006-09-01  Darin Adler  <darin@apple.com>
 
         Reviewed by Brady.

diff --git a/WebCore/platform/qt/FrameQt.cpp b/WebCore/platform/qt/FrameQt.cpp
index 9c9b072ddb81d800cb65df07ee5076e253084647..bc19c242ca14a067dd8f72c60ad2ef7994ae7241 100644 (file)
--- a/WebCore/platform/qt/FrameQt.cpp
+++ b/WebCore/platform/qt/FrameQt.cpp
@@ -434,7 +434,7 @@ void FrameQt::respondToChangedSelection(const SelectionController& oldSelection,
     notImplemented();
 }
 
-void FrameQt::respondToChangedContents()
+void FrameQt::respondToChangedContents(const SelectionController& endingSelection)
 {
     notImplemented();
 }

diff --git a/WebCore/platform/qt/FrameQt.h b/WebCore/platform/qt/FrameQt.h
index df1a57793762a0522896ed2de50734aed2d27989..6dfcd8f503f61989ab4e89938596a7d7971e5ae3 100644 (file)
--- a/WebCore/platform/qt/FrameQt.h
+++ b/WebCore/platform/qt/FrameQt.h
@@ -120,7 +120,7 @@ public:
     virtual void issuePasteAndMatchStyleCommand();
     virtual void issueTransposeCommand();
     virtual void respondToChangedSelection(const SelectionController& oldSelection, bool closeTyping);
-    virtual void respondToChangedContents();
+    virtual void respondToChangedContents(const SelectionController& endingSelection);
     virtual bool shouldChangeSelection(const SelectionController& oldSelection, const SelectionController& newSelection, EAffinity, bool stillSelecting) const;
     virtual void partClearedInBegin();