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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
This commit is contained in:
Eike Ziller
2013-12-05 11:58:42 +01:00
parent d3b8da6cf8 44d254b37b
commit 072d551c73
26 changed files with 13959 additions and 4686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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