diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-02-10 10:35:00 +0200 |
|---|---|---|
| committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-02-11 11:25:39 +0200 |
| commit | 502857f03fc79ba8997e18c012257dc5c020d7cf (patch) | |
| tree | bf010c66e92d52aa0da9dd03c52777e10ac6c541 | |
| parent | 1a6f97656754887176b9576ab0a17dd145f0a016 (diff) | |
Fix macOS build that has -Wunused-function as error
Clang may interpret static inline function as unused, although
it should not. Pragma it out for clang.
Fixes: QTBUG-91053
Change-Id: I8fd8bec5236752189deff8a2f6ceb62e572dca30
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
(cherry picked from commit 21ab254164ab0891e12dbd037fc4e163ff9f6e9d)
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
5 files changed, 6 insertions, 6 deletions
diff --git a/examples/datavisualization/qmloscilloscope/main.cpp b/examples/datavisualization/qmloscilloscope/main.cpp index a874f3d8..f0cb9b68 100644 --- a/examples/datavisualization/qmloscilloscope/main.cpp +++ b/examples/datavisualization/qmloscilloscope/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) // Enable antialiasing in direct rendering mode //! [1] - viewer.setFormat(qDefaultSurfaceFormat()); + viewer.setFormat(qDefaultSurfaceFormat(true)); //! [1] // The following are needed to make examples run without having to install the module diff --git a/examples/datavisualization/qmlsurfacelayers/main.cpp b/examples/datavisualization/qmlsurfacelayers/main.cpp index 7ba7fe34..383e68ef 100644 --- a/examples/datavisualization/qmlsurfacelayers/main.cpp +++ b/examples/datavisualization/qmlsurfacelayers/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) QQuickView viewer; // Enable antialiasing in direct rendering mode - viewer.setFormat(qDefaultSurfaceFormat()); + viewer.setFormat(qDefaultSurfaceFormat(true)); // The following are needed to make examples run without having to install the module // in desktop environments. diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 0f368616..d1b16a88 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -268,7 +268,7 @@ * // ... * * QQuickView viewer; - * viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat()); + * viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat(true)); * \endcode * * \note Antialiasing is not supported in OpenGL ES2 environments. diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index b1bb3a61..c6f22ebe 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -186,7 +186,7 @@ QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFor // Make sure renderable type is correct surfaceFormat.setRenderableType(QSurfaceFormat::DefaultRenderableType); } else { - surfaceFormat = qDefaultSurfaceFormat(); + surfaceFormat = qDefaultSurfaceFormat(true); } d_ptr->m_context = new QOpenGLContext(this); diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index 87bc0f33..dc72835e 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -38,8 +38,8 @@ QT_BEGIN_NAMESPACE -#ifndef Q_QDOC -static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true); +#ifdef Q_OS_MACOS +#pragma clang diagnostic ignored "-Wunused-function" #endif static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) { |