From 94f6071b8a36501d9da516f2bf0f251147c8b934 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Thu, 29 Dec 2016 11:43:27 +0100 Subject: Fix qtdeclarative compilation On ubuntu 14.04 building qtdeclarative from the dev branch is impossible due to various errors in the openvg plugin. Change-Id: I1f2d7d61c36428e64cf3248e550ac5c4f0baa4b0 Reviewed-by: Paolo Angelelli --- .../scenegraph/openvg/qsgopenvgpublicnodes.h | 32 ++++++++++------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h') diff --git a/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h b/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h index 34c8e50615..8e12c27824 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h +++ b/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h @@ -44,10 +44,6 @@ #include #include -#include - -#include - #include "qsgopenvgrenderable.h" QT_BEGIN_NAMESPACE @@ -59,10 +55,10 @@ public: ~QSGOpenVGRectangleNode(); void setRect(const QRectF &rect) override; - QRectF rect() const override { return m_rect; } + QRectF rect() const override; void setColor(const QColor &color) override; - QColor color() const override { return m_color; } + QColor color() const override; void setTransform(const QOpenVGMatrix &transform) override; @@ -86,26 +82,26 @@ public: QSGOpenVGImageNode(); ~QSGOpenVGImageNode(); - void setRect(const QRectF &rect) override { m_rect = rect; markDirty(DirtyMaterial); } - QRectF rect() const override { return m_rect; } + void setRect(const QRectF &rect) override; + QRectF rect() const override; - void setSourceRect(const QRectF &r) override { m_sourceRect = r; } - QRectF sourceRect() const override { return m_sourceRect; } + void setSourceRect(const QRectF &r) override; + QRectF sourceRect() const override; void setTexture(QSGTexture *texture) override; - QSGTexture *texture() const override { return m_texture; } + QSGTexture *texture() const override; - void setFiltering(QSGTexture::Filtering filtering) override { m_filtering = filtering; markDirty(DirtyMaterial); } - QSGTexture::Filtering filtering() const override { return m_filtering; } + void setFiltering(QSGTexture::Filtering filtering) override; + QSGTexture::Filtering filtering() const override; - void setMipmapFiltering(QSGTexture::Filtering) override { } - QSGTexture::Filtering mipmapFiltering() const override { return QSGTexture::None; } + void setMipmapFiltering(QSGTexture::Filtering) override; + QSGTexture::Filtering mipmapFiltering() const override; void setTextureCoordinatesTransform(TextureCoordinatesTransformMode transformNode) override; - TextureCoordinatesTransformMode textureCoordinatesTransform() const override { return m_transformMode; } + TextureCoordinatesTransformMode textureCoordinatesTransform() const override; - void setOwnsTexture(bool owns) override { m_owns = owns; } - bool ownsTexture() const override { return m_owns; } + void setOwnsTexture(bool owns) override; + bool ownsTexture() const override; void render() override; -- cgit v1.2.3