diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-08-10 14:57:09 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-08-12 11:14:36 +0300 |
| commit | a5cd1eed98473e73d89acb73c841e18a17ca8c01 (patch) | |
| tree | 3721ad63fa53f6f5f84ff626ed3ee10c9dd268e6 /src/plugins/scenegraph/softwarecontext/context.cpp | |
| parent | 1d925ee4518ccaa7181bcf96fedcffcb34eeeb1b (diff) | |
Update Qt Quick 2D Renderer to work with Qt 5.6
Change-Id: Ifa2493f773b2c94fcfc1d58229f26864b08019bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/scenegraph/softwarecontext/context.cpp')
| -rw-r--r-- | src/plugins/scenegraph/softwarecontext/context.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/context.cpp b/src/plugins/scenegraph/softwarecontext/context.cpp index f107290f62..a6526335b0 100644 --- a/src/plugins/scenegraph/softwarecontext/context.cpp +++ b/src/plugins/scenegraph/softwarecontext/context.cpp @@ -223,13 +223,9 @@ void RenderContext::invalidate() QSGRenderContext::invalidate(); } -QSGTexture *RenderContext::createTexture(const QImage &image) const -{ - return new PixmapTexture(image); -} - -QSGTexture *RenderContext::createTextureNoAtlas(const QImage &image) const +QSGTexture *RenderContext::createTexture(const QImage &image, uint flags) const { + Q_UNUSED(flags) return new PixmapTexture(image); } |