diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
commit | d9ea4917ca97aeee050a86151fbfa069771b498d (patch) | |
tree | 21fd6960d8a866bf6f5a5a8f9db9be801f8065c1 /tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp | |
parent | f9beafddd256cd0b79bf2478a812053ef61241fc (diff) | |
parent | c6a26c248e8abc421b87c3dd6b2466d490ea902e (diff) |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97
Diffstat (limited to 'tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp')
-rw-r--r-- | tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp index b8ea98df2b..86229b95f3 100644 --- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp +++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp @@ -71,8 +71,7 @@ class LazyPropertyMap : public QQmlPropertyMap, public QQmlParserStatus Q_PROPERTY(int someFixedProperty READ someFixedProperty WRITE setSomeFixedProperty NOTIFY someFixedPropertyChanged) public: LazyPropertyMap() - : QQmlPropertyMap(this, /*parent*/0) - , value(0) + : QQmlPropertyMap(this, /*parent*/nullptr) {} virtual void classBegin() {} @@ -87,7 +86,7 @@ signals: void someFixedPropertyChanged(); private: - int value; + int value = 0; }; void tst_QQmlPropertyMap::initTestCase() @@ -313,7 +312,7 @@ class MyEnhancedPropertyMap : public QQmlPropertyMap { Q_OBJECT public: - MyEnhancedPropertyMap() : QQmlPropertyMap(this, 0), m_testSlotCalled(false) {} + MyEnhancedPropertyMap() : QQmlPropertyMap(this, nullptr) {} bool testSlotCalled() const { return m_testSlotCalled; } signals: @@ -323,7 +322,7 @@ public slots: void testSlot() { m_testSlotCalled = true; } private: - bool m_testSlotCalled; + bool m_testSlotCalled = false; }; void tst_QQmlPropertyMap::metaObjectAccessibility() |