Commit edf42d55 authored by Daniel Teske's avatar Daniel Teske
Browse files

Android: Fix restoring of MakeExtraSearchDirectory



Task-number: QTCREATORBUG-10983
Change-Id: I73dbc3e5279db8d85954d15411b68c47a038bafb
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 713892c0
...@@ -163,9 +163,8 @@ AndroidConfig::AndroidConfig(const QSettings &settings) ...@@ -163,9 +163,8 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
toolchainHost = settings.value(ToolchainHostKey).toString(); toolchainHost = settings.value(ToolchainHostKey).toString();
automaticKitCreation = settings.value(AutomaticKitCreationKey, true).toBool(); automaticKitCreation = settings.value(AutomaticKitCreationKey, true).toBool();
QString extraDirectory = settings.value(MakeExtraSearchDirectory).toString(); QString extraDirectory = settings.value(MakeExtraSearchDirectory).toString();
if (extraDirectory.isEmpty()) makeExtraSearchDirectories.clear();
makeExtraSearchDirectories = QStringList(); if (!extraDirectory.isEmpty())
else
makeExtraSearchDirectories << extraDirectory; makeExtraSearchDirectories << extraDirectory;
PersistentSettingsReader reader; PersistentSettingsReader reader;
...@@ -182,9 +181,8 @@ AndroidConfig::AndroidConfig(const QSettings &settings) ...@@ -182,9 +181,8 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
if (v.isValid()) if (v.isValid())
automaticKitCreation = v.toBool(); automaticKitCreation = v.toBool();
QString extraDirectory = reader.restoreValue(MakeExtraSearchDirectory).toString(); QString extraDirectory = reader.restoreValue(MakeExtraSearchDirectory).toString();
if (extraDirectory.isEmpty()) makeExtraSearchDirectories.clear();
makeExtraSearchDirectories = QStringList(); if (!extraDirectory.isEmpty())
else
makeExtraSearchDirectories << extraDirectory; makeExtraSearchDirectories << extraDirectory;
// persistent settings // persistent settings
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment