diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-10-13 14:15:28 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-10-19 13:54:07 +0200 |
| commit | 7502e57ca84ab2c8097686f38c18618b6da57208 (patch) | |
| tree | 1d63e1d0ffe3de761e2c6657ff5321ba7b7c51e7 | |
| parent | 87f8159c6a230e3ec1b8a628a20b04cc308d9fcf (diff) | |
Apply Q_FLAG to flag type instead of enum type
Change-Id: I05cebef521a532654ae8fa306eed9c8db5a0db69
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/text/qlocale.h | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index c85701dc72..9414f24f71 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -867,7 +867,7 @@ public: RejectTrailingZeroesAfterDot = 0x20 }; Q_DECLARE_FLAGS(NumberOptions, NumberOption) - Q_FLAG(NumberOption) + Q_FLAG(NumberOptions) enum FloatingPointPrecisionOption { FloatingPointShortest = -128 @@ -1064,7 +1064,7 @@ public: AnyLanguageCode = -1 }; Q_DECLARE_FLAGS(LanguageCodeTypes, LanguageCodeType) - Q_FLAG(LanguageCodeType) + Q_FLAG(LanguageCodeTypes) #if QT_CORE_REMOVED_SINCE(6, 3) static QString languageToCode(Language language); diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 569ef247af..4e231c782a 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -74,7 +74,7 @@ class SomethingOfEverything : public QObject Q_PROPERTY(SomethingFlagEnum fprop READ fprop) Q_PROPERTY(QLocale::Language language READ language) Q_ENUMS(SomethingEnum) - Q_FLAGS(SomethingFlagEnum) + Q_FLAGS(SomethingFlag) public: Q_INVOKABLE SomethingOfEverything() {} ~SomethingOfEverything() {} @@ -90,6 +90,7 @@ public: XYZ = 1, UVW = 8 }; + Q_DECLARE_FLAGS(SomethingFlag, SomethingFlagEnum) Q_INVOKABLE Q_SCRIPTABLE void method1() {} |