diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /tests/manual/qscreen/propertyfield.cpp | |
parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'tests/manual/qscreen/propertyfield.cpp')
-rw-r--r-- | tests/manual/qscreen/propertyfield.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/manual/qscreen/propertyfield.cpp b/tests/manual/qscreen/propertyfield.cpp index 94a85545fb..e310798573 100644 --- a/tests/manual/qscreen/propertyfield.cpp +++ b/tests/manual/qscreen/propertyfield.cpp @@ -44,6 +44,9 @@ PropertyField::PropertyField(QObject* subject, const QMetaProperty& prop, QWidge QString PropertyField::valueToString(QVariant val) { + if (m_prop.isEnumType()) + return QString::fromUtf8(m_prop.enumerator().valueToKey(val.toInt())); + QString text; switch (val.type()) { case QVariant::Double: |