Merge remote-tracking branch 'origin/2.8' into HEAD

Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9

9 files changed, 19 insertions, 19 deletions

diff --git a/src/tools/sdktool/addkeysoperation.cpp b/src/tools/sdktool/addkeysoperation.cpp
index 41fc91ba69..c10b53870b 100644
--- a/src/tools/sdktool/addkeysoperation.cpp
+++ b/src/tools/sdktool/addkeysoperation.cpp
@@ -83,10 +83,10 @@ int AddKeysOperation::execute() const
 
     QVariantMap result = addKeys(map, m_data);
     if (result.isEmpty() || map == result)
-        return -4;
+        return 4;
 
     // Write data again:
-    return save(result, m_file) ? 0 : -5;
+    return save(result, m_file) ? 0 : 5;
 }
 
 #ifdef WITH_TESTS
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index 93ea8b6fcb..05b68cb124 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -219,9 +219,9 @@ int AddKitOperation::execute() const
                                 m_deviceType.toUtf8(), m_sysRoot, m_tc, m_qt, m_mkspec, m_extra);
 
     if (result.isEmpty() || map == result)
-        return -2;
+        return 2;
 
-    return save(result, QLatin1String("profiles")) ? 0 : -3;
+    return save(result, QLatin1String("profiles")) ? 0 : 3;
 }
 
 #ifdef WITH_TESTS
diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp
index d86291ee85..43dfd534f0 100644
--- a/src/tools/sdktool/addqtoperation.cpp
+++ b/src/tools/sdktool/addqtoperation.cpp
@@ -155,9 +155,9 @@ int AddQtOperation::execute() const
     QVariantMap result = addQt(map, m_id, m_displayName, m_type, m_qmake, m_extra);
 
     if (result.isEmpty() || result == map)
-        return -2;
+        return 2;
 
-    return save(result, QLatin1String("qtversions")) ? 0 : -3;
+    return save(result, QLatin1String("qtversions")) ? 0 : 3;
 }
 
 #ifdef WITH_TESTS
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp
index 3506b1ae69..7279169660 100644
--- a/src/tools/sdktool/addtoolchainoperation.cpp
+++ b/src/tools/sdktool/addtoolchainoperation.cpp
@@ -151,9 +151,9 @@ int AddToolChainOperation::execute() const
 
     QVariantMap result = addToolChain(map, m_id, m_displayName, m_path, m_targetAbi, m_supportedAbis, m_extra);
     if (result.isEmpty() || map == result)
-        return -2;
+        return 2;
 
-    return save(result, QLatin1String("toolchains")) ? 0 : -3;
+    return save(result, QLatin1String("toolchains")) ? 0 : 3;
 }
 
 #ifdef WITH_TESTS
diff --git a/src/tools/sdktool/getoperation.cpp b/src/tools/sdktool/getoperation.cpp
index ea8f995bdf..e4ffd8c777 100644
--- a/src/tools/sdktool/getoperation.cpp
+++ b/src/tools/sdktool/getoperation.cpp
@@ -70,7 +70,7 @@ int GetOperation::execute() const
     foreach (const QString &key, m_keys) {
         const QVariant result = get(map, key);
         if (result.isValid())
-            return -2;
+            return 2;
         std::cout << qPrintable(result.toString()) << std::endl;
     }
 
diff --git a/src/tools/sdktool/main.cpp b/src/tools/sdktool/main.cpp
index d94ca984b9..18d1e12fbe 100644
--- a/src/tools/sdktool/main.cpp
+++ b/src/tools/sdktool/main.cpp
@@ -111,7 +111,7 @@ int parseArguments(const QStringList &args, Settings *s, const QList<Operation *
                 if (next.isNull()) {
                     std::cerr << "Missing argument to '-s'." << std::endl << std::endl;
                     printHelp(operations);
-                    return -1;
+                    return 1;
                 }
                 s->sdkPath = Utils::FileName::fromString(next);
                 ++i; // skip next;
@@ -135,19 +135,19 @@ int parseArguments(const QStringList &args, Settings *s, const QList<Operation *
 
         std::cerr << "Unknown parameter given." << std::endl << std::endl;
         printHelp(operations);
-        return -1;
+        return 1;
     }
 
     if (!s->operation) {
         std::cerr << "No operation requested." << std::endl << std::endl;
         printHelp(operations);
-        return -1;
+        return 1;
     }
     if (!s->operation->setArguments(opArgs)) {
         std::cerr << "Argument parsing failed." << std::endl << std::endl;
         printHelp(s->operation);
         s->operation = 0;
-        return -1;
+        return 1;
     }
 
     return 0;
diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp
index fe677ea433..c5e6c79334 100644
--- a/src/tools/sdktool/rmkitoperation.cpp
+++ b/src/tools/sdktool/rmkitoperation.cpp
@@ -90,9 +90,9 @@ int RmKitOperation::execute() const
     QVariantMap result = rmKit(map, m_id);
 
     if (result == map)
-        return -2;
+        return 2;
 
-    return save(result, QLatin1String("profiles")) ? 0 : -3;
+    return save(result, QLatin1String("profiles")) ? 0 : 3;
 }
 
 #ifdef WITH_TESTS
diff --git a/src/tools/sdktool/rmqtoperation.cpp b/src/tools/sdktool/rmqtoperation.cpp
index b1fae23cbb..d129300341 100644
--- a/src/tools/sdktool/rmqtoperation.cpp
+++ b/src/tools/sdktool/rmqtoperation.cpp
@@ -90,9 +90,9 @@ int RmQtOperation::execute() const
 
     QVariantMap result = rmQt(map, m_id);
     if (result == map)
-        return -2;
+        return 2;
 
-    return save(result, QLatin1String("qtversion")) ? 0 : -3;
+    return save(result, QLatin1String("qtversion")) ? 0 : 3;
 }
 
 #ifdef WITH_TESTS
diff --git a/src/tools/sdktool/rmtoolchainoperation.cpp b/src/tools/sdktool/rmtoolchainoperation.cpp
index 0224e94f55..72481990ca 100644
--- a/src/tools/sdktool/rmtoolchainoperation.cpp
+++ b/src/tools/sdktool/rmtoolchainoperation.cpp
@@ -91,9 +91,9 @@ int RmToolChainOperation::execute() const
 
     QVariantMap result = rmToolChain(map, m_id);
     if (result == map)
-        return -2;
+        return 2;
 
-    return save(result, QLatin1String("toolchains")) ? 0 : -3;
+    return save(result, QLatin1String("toolchains")) ? 0 : 3;
 }
 
 #ifdef WITH_TESTS