Fix the Qt build. Reviewed by Olliej.

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7fd361415ff54c1c8da6d2b78153b804e74c3f1f..80be66786027555045c02af7542dde39956ba203 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -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.

diff --git a/JavaScriptCore/bindings/qt/qt_instance.cpp b/JavaScriptCore/bindings/qt/qt_instance.cpp
index e42a8bd489685c665949ca1f47cba86416dd8260..4d1bb4494c62ce8c78ed85bb4f140c0f71f6d7c9 100644 (file)
--- a/JavaScriptCore/bindings/qt/qt_instance.cpp
+++ b/JavaScriptCore/bindings/qt/qt_instance.cpp
@@ -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)

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 52099a686d057a99662cbe9bac5cdc8e157bf78d..fafe5a303c9d98f3c0fd9a6e2ee09f5a7bc93157 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -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>

diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/CachedImage.cpp
index 37a9081e93f0782a2efa3f9fa4c8d3de8a2f8e53..722733368f3cb5bcea7febc6a3fffea38876ef9e 100644 (file)
--- a/WebCore/loader/CachedImage.cpp
+++ b/WebCore/loader/CachedImage.cpp
@@ -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>
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9387d765a636449f4fdc33db5c693d2172dd6390..257def06fb24688f174073a61ec2d83e36edbb37 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -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.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
index 58af1f630bb6cd3608e441613eac1a64b229ddde..fb9b1a3ead411181910654a786064b3a082796f6 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
@@ -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
-
+}