diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 01:00:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 01:00:43 +0100 |
| commit | e608b5d55519e3a09ac668710b85e8fb2635bb08 (patch) | |
| tree | 6692ddc9370a70945f6ffc8e15de12f6c3462e2e /src/corelib/doc/src/objectmodel/signalsandslots.qdoc | |
| parent | 9649c41ed950eaa7dd9d3cb6d37a05d3a9ed8a3e (diff) | |
| parent | 097bf6fdd234ca7e5707610edfd3c804b3ba2a52 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I2bf3b4ceb79364330eae4cbf3cdee9a82d1be46d
Diffstat (limited to 'src/corelib/doc/src/objectmodel/signalsandslots.qdoc')
| -rw-r--r-- | src/corelib/doc/src/objectmodel/signalsandslots.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc index fcf091458a..85fe4df2ce 100644 --- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc +++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc @@ -330,7 +330,7 @@ arguments can have default values. Consider QObject::destroyed(): \code - void destroyed(QObject* = 0); + void destroyed(QObject* = nullptr); \endcode When a QObject is deleted, it emits this QObject::destroyed() @@ -339,7 +339,7 @@ A suitable slot signature might be: \code - void objectDestroyed(QObject* obj = 0); + void objectDestroyed(QObject* obj = nullptr); \endcode To connect the signal to the slot, we use QObject::connect(). |