summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/elevatedexecuteoperation.cpp
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-03-19 11:55:02 +0200
committerKatja Marttila <katja.marttila@qt.io>2019-03-19 11:55:02 +0200
commit8c448f77a00d01e24e4d083d9684c275b3efdd04 (patch)
treec75af0ceed6555249c6a2413dc5c0ff0aec928bb /src/libs/installer/elevatedexecuteoperation.cpp
parent2beb45ea0317d0bed9d6085bd927f5a55dff25d5 (diff)
parent407b19ff904244e287d62c7d02ca2a0779fc7b09 (diff)
Merge branch '3.1' into master
Diffstat (limited to 'src/libs/installer/elevatedexecuteoperation.cpp')
-rw-r--r--src/libs/installer/elevatedexecuteoperation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp
index 2cc988a4d..aa88f0398 100644
--- a/src/libs/installer/elevatedexecuteoperation.cpp
+++ b/src/libs/installer/elevatedexecuteoperation.cpp
@@ -43,7 +43,7 @@ class ElevatedExecuteOperation::Private
public:
explicit Private(ElevatedExecuteOperation *qq)
: q(qq)
- , process(0)
+ , process(nullptr)
, showStandardError(false)
{
}
@@ -221,7 +221,7 @@ bool ElevatedExecuteOperation::Private::run(const QStringList &arguments)
Q_ASSERT(process);
Q_ASSERT(process->state() == QProcessWrapper::NotRunning);
delete process;
- process = 0;
+ process = nullptr;
return returnValue;
}