diff options
Diffstat (limited to 'src/widgets/styles/qstylefactory.cpp')
| -rw-r--r-- | src/widgets/styles/qstylefactory.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp index 2c4f6f83a1..54a399ed39 100644 --- a/src/widgets/styles/qstylefactory.cpp +++ b/src/widgets/styles/qstylefactory.cpp @@ -69,7 +69,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, The valid keys can be retrieved using the keys() function. Typically they include "windows" and "fusion". Depending on the platform, "windowsvista" - and "macintosh" may be available. + and "macos" may be available. Note that keys are case insensitive. \sa QStyle @@ -100,6 +100,12 @@ QStyle *QStyleFactory::create(const QString& key) ret = new QFusionStyle; else #endif +#if defined(Q_OS_MACOS) && QT_DEPRECATED_SINCE(6, 0) + if (style == QLatin1String("macintosh")) { + qWarning() << "The style key 'macintosh' is deprecated. Please use 'macos' instead."; + style = QStringLiteral("macos"); + } else +#endif { } // Keep these here - they make the #ifdefery above work if (!ret) ret = qLoadPlugin<QStyle, QStylePlugin>(loader(), style); |