diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
| commit | 6a0bb9a7d6a6473920da74bb48c52a4eaed990b0 (patch) | |
| tree | 3a32c56b1fe21c96d5982511e0b4815c1c07dfbb /examples/qml/referenceexamples/binding/happybirthdaysong.h | |
| parent | f0d23d3ff9da26a71295a6abd356c8d366d17439 (diff) | |
| parent | 2746518c76e02c642ff29faf568de4de90216e58 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
Diffstat (limited to 'examples/qml/referenceexamples/binding/happybirthdaysong.h')
| -rw-r--r-- | examples/qml/referenceexamples/binding/happybirthdaysong.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qml/referenceexamples/binding/happybirthdaysong.h b/examples/qml/referenceexamples/binding/happybirthdaysong.h index ab264b80c7..dcfebc06ba 100644 --- a/examples/qml/referenceexamples/binding/happybirthdaysong.h +++ b/examples/qml/referenceexamples/binding/happybirthdaysong.h @@ -61,9 +61,9 @@ class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_INTERFACES(QQmlPropertyValueSource) public: - HappyBirthdaySong(QObject *parent = 0); + HappyBirthdaySong(QObject *parent = nullptr); - virtual void setTarget(const QQmlProperty &); + void setTarget(const QQmlProperty &) override; QString name() const; void setName(const QString &); |