diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/gallery.qdoc | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qstylefactory.cpp | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc index a82462a432..8f57b9760a 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc @@ -48,7 +48,7 @@ \li The Windows Vista style ("windowsvista") is provided by QWindowsVistaStyle. \row - \li The \macos style ("macintosh") is provided by QMacStyle. + \li The \macos style ("macos") is provided by QMacStyle. \li \image macos-style.png \macos Style \row \li \image fusion-style.png Fusion Style diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 71e18b5af5..7b467d0a3b 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -1066,7 +1066,7 @@ void QApplication::setStyle(QStyle *style) Requests a QStyle object for \a style from the QStyleFactory. The string must be one of the QStyleFactory::keys(), typically one of - "windows", "windowsvista", "fusion", or "macintosh". Style + "windows", "windowsvista", "fusion", or "macos". Style names are case insensitive. Returns \nullptr if an unknown \a style is passed, otherwise the QStyle object 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); |