diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-06-07 02:01:58 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-07 12:46:54 +0000 |
| commit | 9e1b0beb22b64cb76a3f131c3c870726b7891904 (patch) | |
| tree | 0c0f746a582ad1920dfb7820989f9ce082100a9c | |
| parent | 8ef4c33368d6e23fceaf56b35e263a32f7a9dcff (diff) | |
Replace Q_OS_OSX with Q_OS_MACOS
Change-Id: I1b63eda7016a92a857e0b051e173d4e2e886508d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit efc4add580a56410d5d9bba1f80d4963ad5ba96d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualizationqml/abstractdeclarative.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index 35c678f5..3b7eca01 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -15,7 +15,7 @@ #include <QtGui/QPainter> #include <QtOpenGL/QOpenGLFramebufferObject> #include <QtGui/QOffscreenSurface> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) #include <qpa/qplatformnativeinterface.h> #endif @@ -200,7 +200,7 @@ QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFor d_ptr->renderLater(); -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) // Enable touch events for Mac touchpads typedef void * (*EnableTouch)(QWindow*, bool); EnableTouch enableTouch = diff --git a/src/datavisualizationqml/abstractdeclarative.cpp b/src/datavisualizationqml/abstractdeclarative.cpp index 8abfd94c..1c6562b9 100644 --- a/src/datavisualizationqml/abstractdeclarative.cpp +++ b/src/datavisualizationqml/abstractdeclarative.cpp @@ -8,7 +8,7 @@ #if defined(Q_OS_IOS) #include <QtCore/QTimer> #endif -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) #include <qpa/qplatformnativeinterface.h> #endif @@ -428,7 +428,7 @@ void AbstractDeclarative::handleWindowChanged(QQuickWindow *window) if (!window) return; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) bool previousVisibility = window->isVisible(); // Enable touch events for Mac touchpads window->setVisible(true); |