From edf42d55d78c35fffe7960d3036c4a36a288dd2c Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 4 Dec 2013 12:49:25 +0100 Subject: [PATCH] Android: Fix restoring of MakeExtraSearchDirectory Task-number: QTCREATORBUG-10983 Change-Id: I73dbc3e5279db8d85954d15411b68c47a038bafb Reviewed-by: Tobias Hunger --- src/plugins/android/androidconfigurations.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index f3cf89e562c..6254c11d23b 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -163,9 +163,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; @@ -182,9 +181,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 }