aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-12-04 12:49:25 +0100
committerDaniel Teske <daniel.teske@digia.com>2013-12-04 17:39:52 +0100
commitedf42d55d78c35fffe7960d3036c4a36a288dd2c (patch)
tree5340e4c5c5a88f937c66dd10f4caa60494a4eccc
parent713892c02afd9af328851786aa3f4787b989fbda (diff)
Android: Fix restoring of MakeExtraSearchDirectory
Task-number: QTCREATORBUG-10983 Change-Id: I73dbc3e5279db8d85954d15411b68c47a038bafb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/android/androidconfigurations.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index f3cf89e562..6254c11d23 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
}