diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-29 16:56:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:06 +0200 |
| commit | 07e27d030fb181bd9d9c38de6ee08ad15a9171fd (patch) | |
| tree | 7dc884e719b7438bb0977e25f7a59c075324ca2d /src/qml/qml/v8/qv8engine.cpp | |
| parent | b6b88a63becc773a955b63021b32144b7b100ac6 (diff) | |
Convert qml locale object to new data layout
Change-Id: I1c02498102d89be1127fb6bbf0b38e21c48bed8b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)! |