aboutsummaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2019-06-01 12:06:50 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2019-06-04 17:27:36 +0000
commit667fb80cf26e46859e09a32cd40948901e24adfd (patch)
treedb7e1c6b90f450262b7513fd9266a716df4f97a8 /src/app
parent66672ff0a26530d3a005db82f6672513b05c2695 (diff)
Fix some warnings about null pointers
Some of them are false positives, some of them are possible bugs. Change-Id: Ic9c8a2970587e5152659b5b19f6b6d6df67e6809 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/qbs/commandlinefrontend.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/qbs/commandlinefrontend.h b/src/app/qbs/commandlinefrontend.h
index 346b46166..5f598cb35 100644
--- a/src/app/qbs/commandlinefrontend.h
+++ b/src/app/qbs/commandlinefrontend.h
@@ -106,7 +106,7 @@ private:
QString buildDirectory(const QString &profileName) const;
const CommandLineParser &m_parser;
- Settings * const m_settings = nullptr;
+ Settings * const m_settings;
QList<AbstractJob *> m_resolveJobs;
QList<AbstractJob *> m_buildJobs;
QList<Project> m_projects;
@@ -115,7 +115,7 @@ private:
enum CancelStatus { CancelStatusNone, CancelStatusRequested, CancelStatusCanceling };
CancelStatus m_cancelStatus = CancelStatus::CancelStatusNone;
- QTimer * const m_cancelTimer = nullptr;
+ QTimer * const m_cancelTimer;
int m_buildEffortsNeeded = 0;
int m_buildEffortsRetrieved = 0;