summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/widgets/doc/src/icons.qdoc4
-rw-r--r--src/plugins/platforms/cocoa/qcocoatheme.mm2
-rw-r--r--src/plugins/styles/mac/macstyle.json2
-rw-r--r--src/plugins/styles/mac/main.mm2
-rw-r--r--src/plugins/styles/mac/qmacstyle_mac.mm2
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery.qdoc2
-rw-r--r--src/widgets/kernel/qapplication.cpp2
-rw-r--r--src/widgets/styles/qstylefactory.cpp8
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp2
-rw-r--r--tests/auto/widgets/styles/qstyle/tst_qstyle.cpp4
-rw-r--r--tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp2
-rw-r--r--tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp2
12 files changed, 20 insertions, 14 deletions
diff --git a/examples/widgets/doc/src/icons.qdoc b/examples/widgets/doc/src/icons.qdoc
index 36d79a3f05..5dca44a887 100644
--- a/examples/widgets/doc/src/icons.qdoc
+++ b/examples/widgets/doc/src/icons.qdoc
@@ -631,7 +631,7 @@
currently available GUI styles using
QStyleFactory. QStyleFactory::keys() returns a list of valid keys,
typically including "windows" and "fusion". Depending on the platform,
- "windowsvista" and "macintosh" may be available.
+ "windowsvista" and "macos" may be available.
We create one action for each key, and adds the action to the
action group. Also, for each action, we call QAction::setData()
@@ -666,7 +666,7 @@
For each action, we first extract the style name using
QAction::data(). Since this is only a QStyleFactory key (e.g.,
- "macintosh"), we cannot compare it directly to the current
+ "macos"), we cannot compare it directly to the current
style's class name. We need to create a QStyle object using the
static QStyleFactory::create() function and compare the class
name of the created QStyle object with that of the current style.
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index 674a8da60a..ba6e3bdc43 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -501,7 +501,7 @@ QVariant QCocoaTheme::themeHint(ThemeHint hint) const
{
switch (hint) {
case QPlatformTheme::StyleNames:
- return QStringList(QStringLiteral("macintosh"));
+ return QStringList(QStringLiteral("macos"));
case QPlatformTheme::DialogButtonBoxLayout:
return QVariant(QPlatformDialogHelper::MacLayout);
case KeyboardScheme:
diff --git a/src/plugins/styles/mac/macstyle.json b/src/plugins/styles/mac/macstyle.json
index 5897815eec..a3f378799f 100644
--- a/src/plugins/styles/mac/macstyle.json
+++ b/src/plugins/styles/mac/macstyle.json
@@ -1,3 +1,3 @@
{
- "Keys": [ "macintosh" ]
+ "Keys": [ "macos" ]
}
diff --git a/src/plugins/styles/mac/main.mm b/src/plugins/styles/mac/main.mm
index ae31bb95fb..2f11b5cd43 100644
--- a/src/plugins/styles/mac/main.mm
+++ b/src/plugins/styles/mac/main.mm
@@ -53,7 +53,7 @@ public:
QStyle *QMacStylePlugin::create(const QString &key)
{
QMacAutoReleasePool pool;
- if (key.compare(QLatin1String("macintosh"), Qt::CaseInsensitive) == 0)
+ if (key.compare(QLatin1String("macos"), Qt::CaseInsensitive) == 0)
return new QMacStyle();
return 0;
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index a7756919f9..708f298af5 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -2572,7 +2572,7 @@ QPalette QMacStyle::standardPalette() const
{
auto platformTheme = QGuiApplicationPrivate::platformTheme();
auto styleNames = platformTheme->themeHint(QPlatformTheme::StyleNames);
- if (styleNames.toStringList().contains("macintosh"))
+ if (styleNames.toStringList().contains("macos"))
return QPalette(); // Inherit everything from theme
else
return QStyle::standardPalette();
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);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 84841428f0..0329498a94 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -2892,7 +2892,7 @@ void tst_QGraphicsView::scrollBarRanges()
QFETCH(ExpectedValueDescription, vmax);
QFETCH(bool, useStyledPanel);
- if (useStyledPanel && style == "macintosh" && platformName == QStringLiteral("cocoa"))
+ if (useStyledPanel && style == "macos" && platformName == QStringLiteral("cocoa"))
QSKIP("Insignificant on OSX");
QScopedPointer<QStyle> stylePtr;
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index 6963254484..b7b9ab6423 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -270,7 +270,7 @@ bool tst_QStyle::testAllFunctions(QStyle *style)
bool tst_QStyle::testScrollBarSubControls(const QStyle *style)
{
- const bool isMacStyle = style->objectName().compare(QLatin1String("macintosh"),
+ const bool isMacStyle = style->objectName().compare(QLatin1String("macos"),
Qt::CaseInsensitive) == 0;
QScrollBar scrollBar;
setFrameless(&scrollBar);
@@ -328,7 +328,7 @@ void tst_QStyle::testWindowsVistaStyle()
#ifdef Q_OS_MAC
void tst_QStyle::testMacStyle()
{
- QStyle *mstyle = QStyleFactory::create("Macintosh");
+ QStyle *mstyle = QStyleFactory::create("macos");
QVERIFY(testAllFunctions(mstyle));
delete mstyle;
}
diff --git a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
index 657a1ea55c..563f3c6e7b 100644
--- a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
+++ b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
@@ -79,7 +79,7 @@ void tst_QFocusFrame::focusFrameInsideScrollview()
// is why special considerations are taken inside the focus frame to
// prevent the frame to scroll away from the widget it tracks.
- if (qApp->style()->objectName() != QLatin1String("macintosh"))
+ if (qApp->style()->objectName() != QLatin1String("macos"))
QSKIP("This test is only valid when using a style that has a focus frame");
QWidget window;
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index 634497f22f..7b4e85f823 100644
--- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -516,7 +516,7 @@ void tst_QPushButton::sizeHint_data()
QTest::newRow("windows") << QString::fromLatin1("windows");
#endif
#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
- QTest::newRow("macintosh") << QString::fromLatin1("macintosh");
+ QTest::newRow("macos") << QString::fromLatin1("macos");
#endif
#if !defined(QT_NO_STYLE_FUSION)
QTest::newRow("fusion") << QString::fromLatin1("fusion");
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 20:55:51 +0000