diff options
| author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-12-08 11:50:37 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-12-09 05:18:19 +0000 |
| commit | 0e15154c9f0d982096a551efc53fd363d2b2f68d (patch) | |
| tree | 4917ca73c44a92297db7cc3dbd72d2716481ccc7 /src/render/materialsystem/qmaterial.h | |
| parent | 036ea9fcfdd343c805e1a900528e7a2367d6c373 (diff) | |
Added parameters to signals and made setters Q_SLOTS
Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1
Task-number: QTBUG-49797
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qmaterial.h')
| -rw-r--r-- | src/render/materialsystem/qmaterial.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index daf580c11..cfb0bad48 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -61,7 +61,6 @@ public: explicit QMaterial(Qt3DCore::QNode *parent = 0); ~QMaterial(); - void setEffect(QEffect *effect); QEffect *effect() const; void addParameter(QParameter *parameter); @@ -72,8 +71,11 @@ public: void setTextureParameter(QString name, QAbstractTextureProvider* tex); +public Q_SLOTS: + void setEffect(QEffect *effect); + Q_SIGNALS: - void effectChanged(); + void effectChanged(QEffect *effect); protected: QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); |