Another go at fixing the Qt build.

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

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 155731c..bcc32ae 100644 (file)
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -167,7 +167,7 @@ QWebFrame::~QWebFrame()
 void QWebFrame::addToJSWindowObject(const QString &name, QObject *object)
 {
       KJS::JSLock lock;
-      KJS::Window *window = KJS::Window::retrieveWindow(d->frame.get());
+      JSDOMWindow *window = toJSDOMWindow(d->frame.get());
       KJS::Bindings::RootObject *root = d->frame->bindingRootObject();
       if (!window) {
           qDebug() << "Warning: couldn't get window object";

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b5e14fb..be92f28 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-04  Mark Rowe  <mrowe@apple.com>
+
+        Another go at fixing the Qt build.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::addToJSWindowObject):
+
 2008-02-24  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam.