From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Fri, 13 Sep 2013 12:51:20 +0200
Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
---
 Source/WebCore/dom/DeviceMotionController.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/WebCore/dom/DeviceMotionController.h')

diff --git a/Source/WebCore/dom/DeviceMotionController.h b/Source/WebCore/dom/DeviceMotionController.h
index e3d72a982..29bf91341 100644
--- a/Source/WebCore/dom/DeviceMotionController.h
+++ b/Source/WebCore/dom/DeviceMotionController.h
@@ -46,7 +46,7 @@ public:
     virtual bool hasLastData() OVERRIDE;
     virtual PassRefPtr<Event> getLastEvent() OVERRIDE;
 
-    static const AtomicString& supplementName();
+    static const char* supplementName();
     static DeviceMotionController* from(Page*);
     static bool isActiveAt(Page*);
 
-- 
cgit v1.2.1