diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-26 16:04:03 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-06-01 10:32:18 +0000 |
| commit | 1c6d4353f742a740e54b234db4d7b8913d515376 (patch) | |
| tree | 2b0a7602cd96345240f3b021e4453ca560e932c1 /src/quick/items/qquickitemsmodule.cpp | |
| parent | a6d3e3afcdd8f08893cff4deed7e866a5daf3cbd (diff) | |
One GraphicsInfo to rule them all
Rename RendererInfo to GraphicsInfo. Deprecate OpenGLInfo and move
the surface format properties into GraphicsInfo. Move also the
shader info properties from ShaderEffect.
Change-Id: I3b3f01080e059b3a30a132fd67de19a4bfca54ef
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index e5b82e1102..8ed7f2bb05 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -80,7 +80,7 @@ # include "qquickanimatedsprite_p.h" # include "qquickopenglinfo_p.h" #endif -#include "qquickrendererinfo_p.h" +#include "qquickgraphicsinfo_p.h" #include "qquickshadereffect_p.h" #include "qquickshadereffectmesh_p.h" #include "qquickdrag_p.h" @@ -294,8 +294,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterUncreatableType<QQuickMouseEvent, 7>(uri, 2, 7, nullptr, QQuickMouseEvent::tr("MouseEvent is only available within handlers in MouseArea")); - qmlRegisterType<QQuickShaderEffect, 2>(uri, 2, 8, "ShaderEffect"); - qmlRegisterUncreatableType<QQuickRendererInfo>(uri, 2, 8,"RendererInfo", QQuickRendererInfo::tr("RendererInfo is only available via attached properties")); + qmlRegisterUncreatableType<QQuickGraphicsInfo>(uri, 2, 8,"GraphicsInfo", QQuickGraphicsInfo::tr("GraphicsInfo is only available via attached properties")); qmlRegisterType<QQuickBorderImageMesh>("QtQuick", 2, 8, "BorderImageMesh"); } |