Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 3 insertions, 2 deletions

diff --git a/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h b/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h
index 89dfa6785..770c4fc74 100644
--- a/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h
+++ b/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h
@@ -29,11 +29,12 @@
 #ifndef StringSourceProvider_h
 #define StringSourceProvider_h
 
+#include "ScriptSourceProvider.h"
 #include <parser/SourceCode.h>
 
 namespace WebCore {
 
-    class StringSourceProvider : public JSC::SourceProvider {
+    class StringSourceProvider : public ScriptSourceProvider {
     public:
         static PassRefPtr<StringSourceProvider> create(const String& source, const String& url) { return adoptRef(new StringSourceProvider(source, url)); }
 
@@ -44,7 +45,7 @@ namespace WebCore {
 
     private:
         StringSourceProvider(const String& source, const String& url)
-            : SourceProvider(url)
+            : ScriptSourceProvider(url)
             , m_source(source)
         {
         }