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 /examples/qt3d | |
| 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 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/dynamicscene-cpp/boxentity.cpp | 3 | ||||
| -rw-r--r-- | examples/qt3d/dynamicscene-cpp/boxentity.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp index 3ab25fed0..f816b172f 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp +++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp @@ -46,7 +46,8 @@ BoxEntity::BoxEntity(QNode *parent) , m_angle(0.0f) , m_radius(1.0f) { - connect(m_material, SIGNAL(diffuseChanged()), this, SIGNAL(diffuseColorChanged())); + connect(m_material, SIGNAL(diffuseChanged(const QColor &)), + this, SIGNAL(diffuseColorChanged(const QColor &))); m_material->setAmbient(Qt::gray); m_material->setSpecular(Qt::white); m_material->setShininess(150.0f); diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h index cd12bad36..ca8cdb1b6 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.h +++ b/examples/qt3d/dynamicscene-cpp/boxentity.h @@ -63,7 +63,7 @@ public Q_SLOTS: void setRadius(float arg); Q_SIGNALS: - void diffuseColorChanged(); + void diffuseColorChanged(const QColor &); void angleChanged(); void radiusChanged(); |