Merge branch '3.1' into master

Change-Id: I2ac4e385ee771892369d98495ceceb09c481c018

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/installer/globalsettingsoperation.cpp b/src/libs/installer/globalsettingsoperation.cpp
index f8f7c112d..0840cecf2 100644
--- a/src/libs/installer/globalsettingsoperation.cpp
+++ b/src/libs/installer/globalsettingsoperation.cpp
@@ -96,7 +96,7 @@ bool GlobalSettingsOperation::testOperation()
 QSettingsWrapper *GlobalSettingsOperation::setup(QString *key, QString *value, const QStringList &arguments)
 {
     if (!checkArgumentCount(3, 5))
-        return 0;
+        return nullptr;
 
     if (arguments.count() == 5) {
         QSettingsWrapper::Scope scope = QSettingsWrapper::UserScope;
@@ -120,5 +120,5 @@ QSettingsWrapper *GlobalSettingsOperation::setup(QString *key, QString *value, c
         return new QSettingsWrapper(filename, QSettingsWrapper::NativeFormat);
     }
 
-    return 0;
+    return nullptr;
 }