diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-07 13:36:40 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-08 01:09:38 +0200 |
| commit | e255146183d3a1dd9491fd4090cdf4a5244ce754 (patch) | |
| tree | a79643ffe4f8bfa672dde1c21510b19fa12b9745 /src/widgets | |
| parent | 4f952aaea13adfc2d271ed98f111fc8f6d9614ef (diff) | |
Replace use of deprecated Q_OS_MACX in favor of Q_OS_MACOS
Change-Id: I1059d56f67be28a4cc1a66b744e81df6d0b5d00d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 10 | ||||
| -rw-r--r-- | src/widgets/kernel/qstandardgestures.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qfusionstyle_p_p.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 2548a668ce..efd661e829 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -64,7 +64,7 @@ #include "qstyle.h" #include "qstyleoption.h" #include "qvarlengtharray.h" -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) #include <QtCore/QMetaMethod> #include <QtGui/QGuiApplication> #include <qpa/qplatformnativeinterface.h> @@ -579,7 +579,7 @@ public: void _q_updateButtonStates(); void _q_handleFieldObjectDestroyed(QObject *); void setStyle(QStyle *style); -#ifdef Q_OS_MACX +#ifdef Q_OS_MACOS static QPixmap findDefaultBackgroundPixmap(); #endif @@ -1382,7 +1382,7 @@ bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const if (style != QApplication::style()) // Propagate style pushButton->setStyle(style); pushButton->setObjectName(object_name_for_button(which)); -#ifdef Q_OS_MACX +#ifdef Q_OS_MACOS pushButton->setAutoDefault(false); #endif pushButton->hide(); @@ -1740,7 +1740,7 @@ void QWizardPrivate::setStyle(QStyle *style) it.value()->setStyle(style); } -#ifdef Q_OS_MACX +#ifdef Q_OS_MACOS QPixmap QWizardPrivate::findDefaultBackgroundPixmap() { @@ -2871,7 +2871,7 @@ QPixmap QWizard::pixmap(WizardPixmap which) const { Q_D(const QWizard); Q_ASSERT(uint(which) < NPixmaps); -#ifdef Q_OS_MACX +#ifdef Q_OS_MACOS if (which == BackgroundPixmap && d->defaultPixmaps[BackgroundPixmap].isNull()) d->defaultPixmaps[BackgroundPixmap] = d->findDefaultBackgroundPixmap(); #endif diff --git a/src/widgets/kernel/qstandardgestures.cpp b/src/widgets/kernel/qstandardgestures.cpp index 1563e89c45..0a637ab6f8 100644 --- a/src/widgets/kernel/qstandardgestures.cpp +++ b/src/widgets/kernel/qstandardgestures.cpp @@ -60,7 +60,7 @@ static const qreal kSingleStepScaleMin = 0.1; QGesture *QPanGestureRecognizer::create(QObject *target) { if (target && target->isWidgetType()) { -#if (defined(Q_OS_MACX) || defined(Q_OS_WIN)) && !defined(QT_NO_NATIVE_GESTURES) +#if (defined(Q_OS_MACOS) || defined(Q_OS_WIN)) && !defined(QT_NO_NATIVE_GESTURES) // for scroll areas on Windows and OS X we want to use native gestures instead if (!qobject_cast<QAbstractScrollArea *>(target->parent())) static_cast<QWidget *>(target)->setAttribute(Qt::WA_AcceptTouchEvents); diff --git a/src/widgets/styles/qfusionstyle_p_p.h b/src/widgets/styles/qfusionstyle_p_p.h index a92041fcfe..75e0e2878e 100644 --- a/src/widgets/styles/qfusionstyle_p_p.h +++ b/src/widgets/styles/qfusionstyle_p_p.h @@ -87,7 +87,7 @@ public: // On mac we want a standard blue color used when the system palette is used bool isMacSystemPalette(const QPalette &pal) const { Q_UNUSED(pal); -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) const QPalette *themePalette = QGuiApplicationPrivate::platformTheme()->palette(); if (themePalette && themePalette->color(QPalette::Normal, QPalette::Highlight) == pal.color(QPalette::Normal, QPalette::Highlight) && |