Merge remote-tracking branch 'origin/3.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e

1 files changed, 4 insertions, 6 deletions

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index f85fd96b63..f2b2fecac0 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -164,9 +164,8 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
     toolchainHost = settings.value(ToolchainHostKey).toString();
     automaticKitCreation = settings.value(AutomaticKitCreationKey, true).toBool();
     QString extraDirectory = settings.value(MakeExtraSearchDirectory).toString();
-    if (extraDirectory.isEmpty())
-        makeExtraSearchDirectories = QStringList();
-    else
+    makeExtraSearchDirectories.clear();
+    if (!extraDirectory.isEmpty())
         makeExtraSearchDirectories << extraDirectory;
 
     PersistentSettingsReader reader;
@@ -183,9 +182,8 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
         if (v.isValid())
             automaticKitCreation = v.toBool();
         QString extraDirectory = reader.restoreValue(MakeExtraSearchDirectory).toString();
-        if (extraDirectory.isEmpty())
-            makeExtraSearchDirectories = QStringList();
-        else
+        makeExtraSearchDirectories.clear();
+        if (!extraDirectory.isEmpty())
             makeExtraSearchDirectories << extraDirectory;
         // persistent settings
     }