Fix the Qt build. Reviewed by Olliej.
authorstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Dec 2006 03:36:27 +0000 (03:36 +0000)
committerstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Dec 2006 03:36:27 +0000 (03:36 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/bindings/qt/qt_instance.cpp
WebCore/ChangeLog
WebCore/loader/CachedImage.cpp
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro

index 7fd3614..80be667 100644 (file)
@@ -1,3 +1,10 @@
+2006-12-28  George Staikos  <staikos@kde.org>
+
+        Reviewed by Olliej.
+
+        * bindings/qt/qt_instance.cpp: build
+        (KJS::Bindings::QtInstance::QtInstance):
+
 2006-12-28  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Oliver Hunt.
index e42a8bd..4d1bb44 100644 (file)
@@ -35,7 +35,7 @@ QtInstance::QtInstance(QObject* o)
       _class(0),
       _object(o)
 {
-    setExecutionContext(0);
+    setRootObject(0);
 }
 
 QtInstance::~QtInstance() 
@@ -45,7 +45,7 @@ QtInstance::~QtInstance()
 QtInstance::QtInstance(const QtInstance& other)
     : Instance(), _class(0), _object(other._object)
 {
-    setExecutionContext(other.executionContext());
+    setRootObject(other.rootObject());
 }
 
 QtInstance& QtInstance::operator=(const QtInstance& other)
index 52099a6..fafe5a3 100644 (file)
@@ -1,3 +1,9 @@
+2006-12-28  George Staikos  <staikos@kde.org>
+
+        Reviewed by Olliej.
+
+        * loader/CachedImage.cpp: build for Qt
+
 2006-12-28  Daniel Molkentin <molkentin@kde.org>
 
         Reviewed by Eric Seidel <eric@webkit.org>
index 37a9081..7227333 100644 (file)
@@ -36,7 +36,9 @@
 #include "DocLoader.h"
 #include "Image.h"
 #include "LoaderFunctions.h"
+#if PLATFORM(CG)
 #include "PDFDocumentImage.h"
+#endif
 #include "Request.h"
 #include <wtf/Vector.h>
 
index 9387d76..257def0 100644 (file)
@@ -1,3 +1,9 @@
+2006-12-28  George Staikos  <staikos@kde.org>
+
+        Reviewed by Olliej.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro: don't build on non-X11
+
 2006-12-27  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Eric Seidel. Prose edited by Mitz Pettel.
index 58af1f6..fb9b1a3 100644 (file)
@@ -1,3 +1,4 @@
+x11 {
 TARGET = DumpRenderTree
 
 include(../../../WebKit.pri)
@@ -9,4 +10,4 @@ QT = core gui
 
 HEADERS = DumpRenderTreeClient.h DumpRenderTree.h jsobjects.h
 SOURCES = DumpRenderTreeClient.cpp DumpRenderTree.cpp main.cpp fontoverload.cpp jsobjects.cpp
-
+}