diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2022-08-29 17:48:27 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2022-09-01 20:48:49 +0200 |
| commit | 54aa7e75b89d5d27e59594ce35206089ccc22d3b (patch) | |
| tree | 424feaefed0998d5367b0321b31f7b8446b4c699 /tests/auto/corelib | |
| parent | ac22743f214fcb8ecd83808db222fdee85f59e32 (diff) | |
QVariant: fix conversions of Q_ENUM that are QFlags<> to string
The doc of QMetaEnum::valueToKey() says to use ::valueToKeys() instead
for flag types.
Pick-to: 6.4
Change-Id: I48e5ba47324137f2ce2710f1d876e93e7c562e9f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index aa88fd0ea8..5f2ce68918 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -4753,6 +4753,8 @@ void tst_QVariant::metaEnums() testVariantMeta(Qt::RichText, &ok, "RichText"); testVariantMeta(Qt::Alignment(Qt::AlignBottom), &ok, "AlignBottom"); + testVariantMeta(Qt::Alignment(Qt::AlignHCenter | Qt::AlignBottom), &ok, + "AlignHCenter|AlignBottom"); } void tst_QVariant::nullConvert() |