diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-09-02 17:19:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-09-02 17:19:48 +0200 |
| commit | 149ece7a0cfb4fc90fe4544379ee2772fde881fd (patch) | |
| tree | 6a8a3ec11beb53eb06ccc69a0ec04a9d80053c0e /src/qml/qml/qqmlvaluetype.cpp | |
| parent | 9ee31a6ae852eb347951e371958dd435409c9941 (diff) | |
| parent | d1b20513798ed441afddb87fd4e7facce78349e1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ibc7a47f7ce6d15dff79fdc59f8ded297d1b8d50d
Diffstat (limited to 'src/qml/qml/qqmlvaluetype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvaluetype.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp index 6a71a07e9b..53b1ffccb5 100644 --- a/src/qml/qml/qqmlvaluetype.cpp +++ b/src/qml/qml/qqmlvaluetype.cpp @@ -82,7 +82,8 @@ bool QQmlValueTypeFactoryImpl::isValueType(int idx) && idx != QVariant::StringList && idx != QMetaType::QObjectStar && idx != QMetaType::VoidStar - && idx != QMetaType::QVariant) { + && idx != QMetaType::QVariant + && idx != QMetaType::QLocale) { return true; } |