diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-08 12:32:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-08 13:20:48 +0200 |
| commit | 3622ebaac51abd2e4d1541120ae3b6e42932359f (patch) | |
| tree | 580aa25716bfc88d57f15ad68f7bfa727aebc400 /tests/manual/diaglib/logwidget.cpp | |
| parent | f955bd8ced8b93d142b7f755665946424c6d3644 (diff) | |
| parent | c39910993eaf6a7d68fbbe366d990f3f972533ca (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I02cbc4f77a82100b96cdb90c160ce0207f180d7f
Diffstat (limited to 'tests/manual/diaglib/logwidget.cpp')
| -rw-r--r-- | tests/manual/diaglib/logwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/diaglib/logwidget.cpp b/tests/manual/diaglib/logwidget.cpp index 35fabd6e2e..18a82d819e 100644 --- a/tests/manual/diaglib/logwidget.cpp +++ b/tests/manual/diaglib/logwidget.cpp @@ -40,7 +40,7 @@ #include <iostream> -LogWidget *LogWidget::m_instance = 0; +LogWidget *LogWidget::m_instance = nullptr; bool LogWidget::m_lineNumberingEnabled = true; bool LogWidget::m_showMessageType = true; int LogWidget::m_indent = 0; @@ -54,7 +54,7 @@ LogWidget::LogWidget(QWidget *parent) LogWidget::~LogWidget() { - LogWidget::m_instance = 0; + LogWidget::m_instance = nullptr; } QString LogWidget::startupMessage() |