WebCore:

        Reviewed by Tim H.

        Make Qt/Linux compile again completly.

        * platform/qt/WidgetQt.cpp:
        (WebCore::Widget::removeFromParent):

WebKitTools:

        Reviewed by Tim H.

        Fix Qt/Linux build by adapting the s/ScrollBar/Scrollbar/ changes.

        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp:
        (WebCore::DumpRenderTree::DumpRenderTree):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9a1d47671fd734045426684a0c139f905a573780..b074eda71ddc19f0197ad362766bdef8699de0ba 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-06  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Tim H.
+
+        Make Qt/Linux compile again completly.
+
+        * platform/qt/WidgetQt.cpp:
+        (WebCore::Widget::removeFromParent):
+
 2006-10-06  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Tim H.

diff --git a/WebCore/platform/qt/WidgetQt.cpp b/WebCore/platform/qt/WidgetQt.cpp
index 3f36ec4ed847a8d2034017d9f1d2731a21e9b782..812838f595a37b31c20e74b37664560bca0b1c6b 100644 (file)
--- a/WebCore/platform/qt/WidgetQt.cpp
+++ b/WebCore/platform/qt/WidgetQt.cpp
@@ -238,6 +238,11 @@ void Widget::invalidateRect(const IntRect& r)
     notImplemented();
 }
 
+void Widget::removeFromParent()
+{
+    notImplemented();
+}
+
 }
 
 // vim: ts=4 sw=4 et

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index de43b730b271c28f0dcf7f831d549b2650dced4c..c4175cc878f5fb43ce5f95cfd69368600825cd1d 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-06  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Tim H.
+
+        Fix Qt/Linux build by adapting the s/ScrollBar/Scrollbar/ changes.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+
 2006-10-05  Oliver Hunt  <ohunt@apple.com>
 
         Reviewed by Anders.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp
index 16049270d4d968684a70b84cba7784a53ed7618f..54d513ff583d389890aa6bf8a9c161dfc2df1edc 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp
@@ -62,7 +62,7 @@ DumpRenderTree::DumpRenderTree()
     page->setMainFrame(m_frame);
 
     FrameView* view = new FrameView(m_frame);
-    view->setScrollBarsMode(ScrollBarAlwaysOff);
+    view->setScrollbarsMode(ScrollbarAlwaysOff);
 
     m_frame->setView(view);
     view->setParentWidget(0 /* no toplevel widget */);