Fix the Qt build

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 98080bc0de5fa43273a072c9dc5686f87ef62b7c..08ecf2f75f4f964f8d677590d3c9d0aca26ea726 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-08  Zack Rusin  <zrusin@trolltech.com>
+
+        Fix the Qt build
+
+        * bindings/qt/qt_instance.cpp:
+        (KJS::Bindings::QtInstance::QtInstance):
+        * bindings/qt/qt_instance.h:
+
 2007-06-07  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Geoff.

diff --git a/JavaScriptCore/bindings/qt/qt_instance.cpp b/JavaScriptCore/bindings/qt/qt_instance.cpp
index 7e9bc7e94fab5357312c012ea0a6e34e8fe360ff..1278da1c23a930a9085f33cba48b2613037a57ec 100644 (file)
--- a/JavaScriptCore/bindings/qt/qt_instance.cpp
+++ b/JavaScriptCore/bindings/qt/qt_instance.cpp
@@ -30,12 +30,11 @@
 namespace KJS {
 namespace Bindings {
 
-QtInstance::QtInstance(QObject* o)
-    : Instance(),
+QtInstance::QtInstance(QObject* o, PassRefPtr<RootObject> rootObject)
+    : Instance(rootObject),
       _class(0),
       _object(o)
 {
-    setRootObject(0);
 }
 
 QtInstance::~QtInstance() 
@@ -43,9 +42,8 @@ QtInstance::~QtInstance()
 }
 
 QtInstance::QtInstance(const QtInstance& other)
-    : Instance(), _class(0), _object(other._object)
+    : Instance(other.rootObject()), _class(0), _object(other._object)
 {
-    setRootObject(other.rootObject());
 }
 
 QtInstance& QtInstance::operator=(const QtInstance& other)

diff --git a/JavaScriptCore/bindings/qt/qt_instance.h b/JavaScriptCore/bindings/qt/qt_instance.h
index d19442fe59a3826404ac00b6d3c987cb636b7658..f5be9de6000854ace8ab454c49fcfdb651f7c6fd 100644 (file)
--- a/JavaScriptCore/bindings/qt/qt_instance.h
+++ b/JavaScriptCore/bindings/qt/qt_instance.h
@@ -35,7 +35,7 @@ class QtClass;
 class QtInstance : public Instance
 {
 public:
-    QtInstance(QObject* instance);
+    QtInstance(QObject* instance, PassRefPtr<RootObject>);
         
     ~QtInstance ();