diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-02-07 17:52:21 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-02-08 15:55:47 +0200 |
| commit | d3ca6c67f1b8fbf5d71c307e71ba89a483ec75bc (patch) | |
| tree | 194565cdc8bf7f497eb7c157b35e73042551ea2e /platform/qt/src/qt_conversion.hpp | |
| parent | 7db79da50185a471f77ebed52575c3bc212c7d7d (diff) | |
| download | qtlocation-mapboxgl-d3ca6c67f1b8fbf5d71c307e71ba89a483ec75bc.tar.gz | |
[Qt] Added QMapbox::Feature → GeoJSON conversion helper
Diffstat (limited to 'platform/qt/src/qt_conversion.hpp')
| -rw-r--r-- | platform/qt/src/qt_conversion.hpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/platform/qt/src/qt_conversion.hpp b/platform/qt/src/qt_conversion.hpp index ae05200d66..4b93ca7423 100644 --- a/platform/qt/src/qt_conversion.hpp +++ b/platform/qt/src/qt_conversion.hpp @@ -30,7 +30,13 @@ inline QVariant arrayMember(const QVariant& value, std::size_t i) { } inline bool isObject(const QVariant& value) { - return value.canConvert(QVariant::Map) || value.type() == QVariant::ByteArray; + return value.canConvert(QVariant::Map) + || value.type() == QVariant::ByteArray +#if QT_VERSION >= 0x050000 + || QString(value.typeName()) == QStringLiteral("QMapbox::Feature"); +#else + || QString(value.typeName()) == QString("QMapbox::Feature"); +#endif } inline optional<QVariant> objectMember(const QVariant& value, const char* key) { |