diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:38 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:47 +0100 |
| commit | 6767114285db9d0e16dc278d08f231e8561546b4 (patch) | |
| tree | 0945902a2242fd7ec0a1f7fd3e6acbb769e723bd /tests/auto/qml/qqmlmoduleplugin/protectedModule/plugin.cpp | |
| parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
| parent | c32b109e9dea44c6775c2dbf8f164870c1dc8971 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin/protectedModule/plugin.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/protectedModule/plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/protectedModule/plugin.cpp index afdeea80f4..ae8c231aab 100644 --- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/plugin.cpp @@ -33,7 +33,7 @@ class MyPluginType : public QObject { Q_OBJECT public: - MyPluginType(QObject *parent=0) : QObject(parent) {} + MyPluginType(QObject *parent=nullptr) : QObject(parent) {} }; |