diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
| commit | 1d333d3375874efb8d37df37dc5ef561573794ad (patch) | |
| tree | 2d8c995f64c05c84c1fcceb2c5cb40fcae69855f /src/quick/items/qquickgraphicsinfo.cpp | |
| parent | b106d86c433706928b0b0c206a0d9f831681e1bf (diff) | |
| parent | e79a2658cde899d6ee11ec3c0d0a3768eb2c864b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
Diffstat (limited to 'src/quick/items/qquickgraphicsinfo.cpp')
| -rw-r--r-- | src/quick/items/qquickgraphicsinfo.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/items/qquickgraphicsinfo.cpp b/src/quick/items/qquickgraphicsinfo.cpp index 8f6f4386fb..adf620b256 100644 --- a/src/quick/items/qquickgraphicsinfo.cpp +++ b/src/quick/items/qquickgraphicsinfo.cpp @@ -95,7 +95,6 @@ QQuickGraphicsInfo *QQuickGraphicsInfo::qmlAttachedProperties(QObject *object) \li GraphicsInfo.Unknown - the default value when no active scenegraph is associated with the item \li GraphicsInfo.Software - Qt Quick's software renderer based on QPainter with the raster paint engine \li GraphicsInfo.OpenGL - OpenGL or OpenGL ES - \li GraphicsInfo.Direct3D12 - Direct3D 12 \li GraphicsInfo.OpenVG - OpenVG \li GraphicsInfo.OpenGLRhi - OpenGL on top of QRhi, a graphics abstraction layer \li GraphicsInfo.Direct3D11Rhi - Direct3D 11 on top of QRhi, a graphics abstraction layer |