diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-17 07:25:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-17 07:25:13 +0100 |
| commit | e7650520ef2d986051e00a86a5fe47d3859cbd44 (patch) | |
| tree | 4af3a37717cecec181c456fcf2c6097e2dc83182 /src/quick/scenegraph/qsgrhisupport.cpp | |
| parent | 1989323559a7bc08a469f9708c644dcad1f57600 (diff) | |
| parent | 896f772581849f970df5ecb2b73a829c9a0348b4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4engine.cpp
src/qml/parser/qqmljs.g
Change-Id: I5f89199ef7a846032a3118cba1298de992c22f8f
Diffstat (limited to 'src/quick/scenegraph/qsgrhisupport.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgrhisupport.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp index afcfa53e83..9194d3e730 100644 --- a/src/quick/scenegraph/qsgrhisupport.cpp +++ b/src/quick/scenegraph/qsgrhisupport.cpp @@ -465,6 +465,10 @@ QOffscreenSurface *QSGRhiSupport::maybeCreateOffscreenSurface(QWindow *window) // must be called on the render thread QRhi *QSGRhiSupport::createRhi(QWindow *window, QOffscreenSurface *offscreenSurface) { +#if !QT_CONFIG(opengl) && !QT_CONFIG(vulkan) + Q_UNUSED(window); +#endif + QRhi *rhi = nullptr; QRhi::Flags flags; @@ -487,6 +491,8 @@ QRhi *QSGRhiSupport::createRhi(QWindow *window, QOffscreenSurface *offscreenSurf rhiParams.window = window; rhi = QRhi::create(backend, &rhiParams, flags); } +#else + Q_UNUSED(offscreenSurface); #endif #if QT_CONFIG(vulkan) if (backend == QRhi::Vulkan) { |