From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 24 May 2011 11:24:40 +0100
Subject: Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
---
 Source/WebCore/bridge/testqtbindings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/WebCore/bridge/testqtbindings.cpp')

diff --git a/Source/WebCore/bridge/testqtbindings.cpp b/Source/WebCore/bridge/testqtbindings.cpp
index 592415e..20bf88a 100644
--- a/Source/WebCore/bridge/testqtbindings.cpp
+++ b/Source/WebCore/bridge/testqtbindings.cpp
@@ -74,7 +74,7 @@ public slots:
 using namespace JSC;
 using namespace JSC::Bindings;
 
-class Global : public JSObject {
+class Global : public JSNonFinalObject {
 public:
   virtual UString className() const { return "global"; }
 };
-- 
cgit v1.1