diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-01 01:00:53 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-01 01:00:54 +0100 |
| commit | 7aa204d5b30d3d55ac838b4df601feaa368412b8 (patch) | |
| tree | ecc155d46985f1143845d3bd13074914149f22f3 /src/corelib/global/qnamespace.h | |
| parent | c47ec42f02196f387c28ab1a5ac70a23ec642a63 (diff) | |
| parent | 55b464196297afc11cb9836f61f737e6fdaf04dc (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Icec0aa703d8a13efa9f1634a1a353eb9d63685c8
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 41b94bf15a..6488426e64 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -500,7 +500,9 @@ public: AA_NativeWindows = 3, AA_DontCreateNativeWidgetSiblings = 4, AA_PluginApplication = 5, - AA_MacPluginApplication = AA_PluginApplication, // ### Qt 6: remove me +#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove me + AA_MacPluginApplication Q_DECL_ENUMERATOR_DEPRECATED = AA_PluginApplication, +#endif AA_DontUseNativeMenuBar = 6, AA_MacDontSwapCtrlAndMeta = 7, AA_Use96Dpi = 8, @@ -1504,12 +1506,12 @@ public: // Metadata FontRole = 6, TextAlignmentRole = 7, -#if QT_DEPRECATED_SINCE(5, 13) - BackgroundColorRole = 8, - TextColorRole = 9, -#endif BackgroundRole = 8, ForegroundRole = 9, +#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove me + BackgroundColorRole Q_DECL_ENUMERATOR_DEPRECATED = BackgroundRole, + TextColorRole Q_DECL_ENUMERATOR_DEPRECATED = ForegroundRole, +#endif CheckStateRole = 10, // Accessibility AccessibleTextRole = 11, |