From 18a562554e9050f0d8b4896237dc0fb306f6a704 Mon Sep 17 00:00:00 2001 From: Tuomo Pelkonen Date: Wed, 20 Jan 2021 14:15:36 +0200 Subject: Force OpenGL backend for RHI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set QSG_RHI_BACKEND environment variable to "opengl" to force RHI to use OpenGL backend. Change-Id: Ie1fa0ffe466f97b1bbcc5281c49bbdf6e6d053c0 Reviewed-by: Tomi Korpipää --- examples/datavisualization/audiolevels/main.cpp | 1 + examples/datavisualization/bars/main.cpp | 1 + examples/datavisualization/custominput/main.cpp | 1 + examples/datavisualization/customitems/main.cpp | 1 + examples/datavisualization/customproxy/main.cpp | 1 + examples/datavisualization/draggableaxes/main.cpp | 1 + examples/datavisualization/itemmodel/main.cpp | 1 + examples/datavisualization/qmlaxisdrag/main.cpp | 1 + examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml | 2 +- examples/datavisualization/qmlaxisformatter/main.cpp | 1 + .../datavisualization/qmlaxisformatter/qml/qmlaxisformatter/main.qml | 2 +- examples/datavisualization/qmlbars/main.cpp | 1 + examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml | 2 +- examples/datavisualization/qmlbars/qml/qmlbars/main.qml | 2 +- examples/datavisualization/qmlcustominput/main.cpp | 1 + examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml | 2 +- examples/datavisualization/qmllegend/main.cpp | 1 + examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml | 2 +- examples/datavisualization/qmllegend/qml/qmllegend/main.qml | 2 +- examples/datavisualization/qmlmultigraph/main.cpp | 1 + examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml | 2 +- examples/datavisualization/qmloscilloscope/main.cpp | 1 + examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml | 2 +- examples/datavisualization/qmlscatter/main.cpp | 1 + examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml | 2 +- examples/datavisualization/qmlspectrogram/main.cpp | 1 + examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml | 2 +- examples/datavisualization/qmlsurface/main.cpp | 1 + examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml | 2 +- examples/datavisualization/qmlsurfacelayers/main.cpp | 1 + .../datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml | 2 +- examples/datavisualization/rotations/main.cpp | 1 + examples/datavisualization/scatter/main.cpp | 1 + examples/datavisualization/surface/main.cpp | 1 + examples/datavisualization/texturesurface/main.cpp | 1 + examples/datavisualization/volumetric/main.cpp | 1 + 36 files changed, 36 insertions(+), 13 deletions(-) (limited to 'examples/datavisualization') diff --git a/examples/datavisualization/audiolevels/main.cpp b/examples/datavisualization/audiolevels/main.cpp index eeb7baff..3ecf1387 100644 --- a/examples/datavisualization/audiolevels/main.cpp +++ b/examples/datavisualization/audiolevels/main.cpp @@ -36,6 +36,7 @@ using namespace QtDataVisualization; int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); Q3DBars window; diff --git a/examples/datavisualization/bars/main.cpp b/examples/datavisualization/bars/main.cpp index 6eb718fa..eaa7c61d 100644 --- a/examples/datavisualization/bars/main.cpp +++ b/examples/datavisualization/bars/main.cpp @@ -44,6 +44,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); //! [0] QApplication app(argc, argv); Q3DBars *widgetgraph = new Q3DBars(); diff --git a/examples/datavisualization/custominput/main.cpp b/examples/datavisualization/custominput/main.cpp index d9e3b403..6491890f 100644 --- a/examples/datavisualization/custominput/main.cpp +++ b/examples/datavisualization/custominput/main.cpp @@ -43,6 +43,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); QApplication app(argc, argv); Q3DScatter *graph = new Q3DScatter(); QWidget *container = QWidget::createWindowContainer(graph); diff --git a/examples/datavisualization/customitems/main.cpp b/examples/datavisualization/customitems/main.cpp index 2261cf54..114a9fa7 100644 --- a/examples/datavisualization/customitems/main.cpp +++ b/examples/datavisualization/customitems/main.cpp @@ -39,6 +39,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); QApplication app(argc, argv); Q3DSurface *graph = new Q3DSurface(); QWidget *container = QWidget::createWindowContainer(graph); diff --git a/examples/datavisualization/customproxy/main.cpp b/examples/datavisualization/customproxy/main.cpp index 8c0d9346..47b85850 100644 --- a/examples/datavisualization/customproxy/main.cpp +++ b/examples/datavisualization/customproxy/main.cpp @@ -34,6 +34,7 @@ using namespace QtDataVisualization; int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); Q3DBars *rainfall = new Q3DBars; diff --git a/examples/datavisualization/draggableaxes/main.cpp b/examples/datavisualization/draggableaxes/main.cpp index f2d2c703..5c7621b0 100644 --- a/examples/datavisualization/draggableaxes/main.cpp +++ b/examples/datavisualization/draggableaxes/main.cpp @@ -38,6 +38,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); QApplication app(argc, argv); Q3DScatter *graph = new Q3DScatter(); QWidget *container = QWidget::createWindowContainer(graph); diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp index 35bf7e0d..6cccacae 100644 --- a/examples/datavisualization/itemmodel/main.cpp +++ b/examples/datavisualization/itemmodel/main.cpp @@ -247,6 +247,7 @@ void GraphDataGenerator::fixTableSize() int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); //! [0] QApplication app(argc, argv); Q3DBars *graph = new Q3DBars(); diff --git a/examples/datavisualization/qmlaxisdrag/main.cpp b/examples/datavisualization/qmlaxisdrag/main.cpp index 4e2fa483..098c25ef 100644 --- a/examples/datavisualization/qmlaxisdrag/main.cpp +++ b/examples/datavisualization/qmlaxisdrag/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml index c12c40e4..c9846729 100644 --- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml +++ b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml @@ -28,7 +28,7 @@ ****************************************************************************/ import QtQuick -import QtDataVisualization +import QtDataVisualization 1.1 import QtQuick.Controls import "." diff --git a/examples/datavisualization/qmlaxisformatter/main.cpp b/examples/datavisualization/qmlaxisformatter/main.cpp index 71d0470a..ec419f75 100644 --- a/examples/datavisualization/qmlaxisformatter/main.cpp +++ b/examples/datavisualization/qmlaxisformatter/main.cpp @@ -39,6 +39,7 @@ Q_DECLARE_METATYPE(CustomFormatter *) int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); //! [1] diff --git a/examples/datavisualization/qmlaxisformatter/qml/qmlaxisformatter/main.qml b/examples/datavisualization/qmlaxisformatter/qml/qmlaxisformatter/main.qml index 044cd2dc..58453c8c 100644 --- a/examples/datavisualization/qmlaxisformatter/qml/qmlaxisformatter/main.qml +++ b/examples/datavisualization/qmlaxisformatter/qml/qmlaxisformatter/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import QtDataVisualization +import QtDataVisualization 1.2 import CustomFormatter import "." diff --git a/examples/datavisualization/qmlbars/main.cpp b/examples/datavisualization/qmlbars/main.cpp index 5cf2eef9..7013b312 100644 --- a/examples/datavisualization/qmlbars/main.cpp +++ b/examples/datavisualization/qmlbars/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml index 93a72258..9d242510 100644 --- a/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml +++ b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml @@ -28,7 +28,7 @@ ****************************************************************************/ import QtQuick -import QtDataVisualization +import QtDataVisualization 1.2 Item { property alias column: columnAxis diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml index 98167504..a3de7142 100644 --- a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml +++ b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtDataVisualization +import QtDataVisualization 1.2 import QtQuick.Window import Qt.labs.qmlmodels import "." diff --git a/examples/datavisualization/qmlcustominput/main.cpp b/examples/datavisualization/qmlcustominput/main.cpp index 92ab7c5b..84587f59 100644 --- a/examples/datavisualization/qmlcustominput/main.cpp +++ b/examples/datavisualization/qmlcustominput/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml index 53997127..67edcb61 100644 --- a/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml +++ b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import QtDataVisualization +import QtDataVisualization 1.2 import "." Rectangle { diff --git a/examples/datavisualization/qmllegend/main.cpp b/examples/datavisualization/qmllegend/main.cpp index c7876ca0..65cd90ab 100644 --- a/examples/datavisualization/qmllegend/main.cpp +++ b/examples/datavisualization/qmllegend/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml b/examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml index 5611a065..5d63bde2 100644 --- a/examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml +++ b/examples/datavisualization/qmllegend/qml/qmllegend/LegendItem.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Window -import QtDataVisualization +import QtDataVisualization 1.2 Rectangle { //! [0] diff --git a/examples/datavisualization/qmllegend/qml/qmllegend/main.qml b/examples/datavisualization/qmllegend/qml/qmllegend/main.qml index 3d795dfd..831e7dc7 100644 --- a/examples/datavisualization/qmllegend/qml/qmllegend/main.qml +++ b/examples/datavisualization/qmllegend/qml/qmllegend/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtDataVisualization +import QtDataVisualization 1.2 import "." Rectangle { diff --git a/examples/datavisualization/qmlmultigraph/main.cpp b/examples/datavisualization/qmlmultigraph/main.cpp index b7ca9b99..188eda01 100644 --- a/examples/datavisualization/qmlmultigraph/main.cpp +++ b/examples/datavisualization/qmlmultigraph/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml index 6908f1c7..a5a64a5e 100644 --- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml +++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import QtDataVisualization +import QtDataVisualization 1.2 import "." Rectangle { diff --git a/examples/datavisualization/qmloscilloscope/main.cpp b/examples/datavisualization/qmloscilloscope/main.cpp index 685f2cd8..03610b3a 100644 --- a/examples/datavisualization/qmloscilloscope/main.cpp +++ b/examples/datavisualization/qmloscilloscope/main.cpp @@ -41,6 +41,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml index dfb67424..6eb6e06f 100644 --- a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml +++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import QtDataVisualization +import QtDataVisualization 1.2 import "." Item { diff --git a/examples/datavisualization/qmlscatter/main.cpp b/examples/datavisualization/qmlscatter/main.cpp index 03a45c7e..a5327cdc 100644 --- a/examples/datavisualization/qmlscatter/main.cpp +++ b/examples/datavisualization/qmlscatter/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml index 6e54fc96..ba86812e 100644 --- a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml @@ -31,7 +31,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import QtDataVisualization +import QtDataVisualization 1.2 import "." //! [0] diff --git a/examples/datavisualization/qmlspectrogram/main.cpp b/examples/datavisualization/qmlspectrogram/main.cpp index 6f93c1e2..03ac8f4e 100644 --- a/examples/datavisualization/qmlspectrogram/main.cpp +++ b/examples/datavisualization/qmlspectrogram/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; diff --git a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml index 66de168c..3e7478ef 100644 --- a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml +++ b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml @@ -31,7 +31,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import QtQuick.Window -import QtDataVisualization +import QtDataVisualization 1.2 import "." Window { diff --git a/examples/datavisualization/qmlsurface/main.cpp b/examples/datavisualization/qmlsurface/main.cpp index 40df60f0..f425c7f5 100644 --- a/examples/datavisualization/qmlsurface/main.cpp +++ b/examples/datavisualization/qmlsurface/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml index 107e2f75..2124346a 100644 --- a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import QtDataVisualization +import QtDataVisualization 1.2 import "." Rectangle { diff --git a/examples/datavisualization/qmlsurfacelayers/main.cpp b/examples/datavisualization/qmlsurfacelayers/main.cpp index d54cb447..f7248edb 100644 --- a/examples/datavisualization/qmlsurfacelayers/main.cpp +++ b/examples/datavisualization/qmlsurfacelayers/main.cpp @@ -36,6 +36,7 @@ int main(int argc, char *argv[]) { + qputenv("QSG_RHI_BACKEND", "opengl"); QGuiApplication app(argc, argv); QQuickView viewer; diff --git a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml index c02c399f..b2469ba9 100644 --- a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml +++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml @@ -30,7 +30,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import QtDataVisualization +import QtDataVisualization 1.2 import "." Item { diff --git a/examples/datavisualization/rotations/main.cpp b/examples/datavisualization/rotations/main.cpp index 23ae94f8..1f225bab 100644 --- a/examples/datavisualization/rotations/main.cpp +++ b/examples/datavisualization/rotations/main.cpp @@ -41,6 +41,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); QApplication app(argc, argv); Q3DScatter *graph = new Q3DScatter(); QWidget *container = QWidget::createWindowContainer(graph); diff --git a/examples/datavisualization/scatter/main.cpp b/examples/datavisualization/scatter/main.cpp index f31eca9e..52a4e397 100644 --- a/examples/datavisualization/scatter/main.cpp +++ b/examples/datavisualization/scatter/main.cpp @@ -44,6 +44,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); //! [0] QApplication app(argc, argv); Q3DScatter *graph = new Q3DScatter(); diff --git a/examples/datavisualization/surface/main.cpp b/examples/datavisualization/surface/main.cpp index 0cc48b42..d8ac30c5 100644 --- a/examples/datavisualization/surface/main.cpp +++ b/examples/datavisualization/surface/main.cpp @@ -45,6 +45,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); //! [0] QApplication app(argc, argv); Q3DSurface *graph = new Q3DSurface(); diff --git a/examples/datavisualization/texturesurface/main.cpp b/examples/datavisualization/texturesurface/main.cpp index 86d03ac9..fc45247f 100644 --- a/examples/datavisualization/texturesurface/main.cpp +++ b/examples/datavisualization/texturesurface/main.cpp @@ -42,6 +42,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); QApplication app(argc, argv); Q3DSurface *graph = new Q3DSurface(); QWidget *container = QWidget::createWindowContainer(graph); diff --git a/examples/datavisualization/volumetric/main.cpp b/examples/datavisualization/volumetric/main.cpp index 751886a8..1a859018 100644 --- a/examples/datavisualization/volumetric/main.cpp +++ b/examples/datavisualization/volumetric/main.cpp @@ -43,6 +43,7 @@ int main(int argc, char **argv) { + qputenv("QSG_RHI_BACKEND", "opengl"); QApplication app(argc, argv); Q3DScatter *graph = new Q3DScatter(); QWidget *container = QWidget::createWindowContainer(graph); -- cgit v1.2.3