feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix restoring of MakeExtraSearchDirectory

Browse Source 
Task-number: QTCREATORBUG-10983
Change-Id: I73dbc3e5279db8d85954d15411b68c47a038bafb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-12-04 12:49:25 +01:00
parent 713892c02a
commit edf42d55d7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidconfigurations.cpp
View File

@@ -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)
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
} }