Qt build fix: Get globalExec() from the right place.
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Dec 2007 08:06:50 +0000 (08:06 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Dec 2007 08:06:50 +0000 (08:06 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 02663fe654bb3303a874577d401555edabd759f4..bd553ac92bd059aa4ac9e1edfcc44f435a215775 100644 (file)
@@ -59,6 +59,8 @@
 
 #include "wtf/HashMap.h"
 
+#include "kjs/JSGlobalObject.h"
+
 #include <qdebug.h>
 #include <qevent.h>
 #include <qpainter.h>
@@ -150,7 +152,7 @@ void QWebFrame::addToJSWindowObject(const QByteArray &name, QObject *object)
         KJS::Bindings::Instance::createRuntimeObject(KJS::Bindings::Instance::QtLanguage,
                                                      object, root);
 
-      window->put(window->interpreter()->globalExec(), KJS::Identifier(name.constData()), runtimeObject);
+      window->put(window->globalExec(), KJS::Identifier(name.constData()), runtimeObject);
 }
 
 
@@ -276,7 +278,7 @@ QString QWebFrame::evaluateJavaScript(const QString& scriptSource)
     if (proxy) {
         KJS::JSValue *v = proxy->evaluate(String(), 0, scriptSource);
         if (v) {
-            rc = String(v->toString(proxy->interpreter()->globalExec()));
+            rc = String(v->toString(proxy->globalObject()->globalExec()));
         }
     }
     return rc;
index 42c02f94c9bfb2baff01b57c5a5c363f8da9b82f..26a89068d4c7b583ddf4a181ce247dffd937ae9a 100644 (file)
@@ -1,3 +1,7 @@
+2007-12-03  Geoffrey Garen  <ggaren@apple.com>
+
+        Qt build fix: Get globalExec() from the right place.
+
 2007-11-30  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
 
         Reviewed by Simon.