From 07e27d030fb181bd9d9c38de6ee08ad15a9171fd Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Tue, 29 Apr 2014 16:56:17 +0200
Subject: Convert qml locale object to new data layout

Change-Id: I1c02498102d89be1127fb6bbf0b38e21c48bed8b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/qml/v8/qv8engine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/qml/qml/v8/qv8engine.cpp')

diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 178eeb2c64..2c5d8191aa 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -398,7 +398,7 @@ QVariant QV8Engine::toBasicVariant(const QV4::ValueRef value)
     if (value->isString())
         return value->stringValue()->toQString();
     if (QQmlLocaleData *ld = value->as<QQmlLocaleData>())
-        return ld->locale;
+        return ld->d()->locale;
     if (QV4::DateObject *d = value->asDateObject())
         return d->toQDateTime();
     // NOTE: since we convert QTime to JS Date, round trip will change the variant type (to QDateTime)!
-- 
cgit v1.2.3