Another go at fixing the Qt build.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Mar 2008 04:40:36 +0000 (04:40 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Mar 2008 04:40:36 +0000 (04:40 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30785 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/qt/Api/qwebframe.cpp
WebKit/qt/ChangeLog

index 155731c..bcc32ae 100644 (file)
@@ -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";
index b5e14fb..be92f28 100644 (file)
@@ -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.