diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-02-18 11:41:50 +0100 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2015-02-25 15:24:40 +0000 |
| commit | be4f5d55fcb7715460ab08b4e50b0468555cd065 (patch) | |
| tree | c59bba293825af4030c3445d4895377e7fcf9ddc | |
| parent | 18ab75be815ab97ab1f70be04297634b6225ab0a (diff) | |
QVariant: fix converting enum to string
Use QMetaEnum::valueToKey instead of valueToKeys.
Change-Id: I270f0820a03aaebde94c37c011c5e9b81421b50f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 3dc0805dd1..b14c9ed167 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -460,7 +460,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) { QMetaEnum en = metaEnumFromType(d->type); if (en.isValid()) { - *str = QString::fromUtf8(en.valueToKeys(qConvertToNumber(d, ok))); + *str = QString::fromUtf8(en.valueToKey(qConvertToNumber(d, ok))); return *ok; } } @@ -637,7 +637,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) { QMetaEnum en = metaEnumFromType(d->type); if (en.isValid()) { - *ba = en.valueToKeys(qConvertToNumber(d, ok)); + *ba = en.valueToKey(qConvertToNumber(d, ok)); return *ok; } } diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 52fc4e1806..32674c587c 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -77,7 +77,7 @@ public: } - enum MetaEnumTest_Enum0 { MetaEnumTest_Enum0_value = 42, MetaEnsureSignedEnum0 = -1 }; + enum MetaEnumTest_Enum0 { MetaEnumTest_Enum0_dummy = 2, MetaEnumTest_Enum0_value = 42, MetaEnsureSignedEnum0 = -1 }; Q_ENUM(MetaEnumTest_Enum0) enum MetaEnumTest_Enum1 { MetaEnumTest_Enum1_value = 42, MetaEnumTest_Enum1_bigValue = (Q_INT64_C(1) << 33) + 50 }; Q_ENUM(MetaEnumTest_Enum1) |