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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
This commit is contained in:
Eike Ziller
2013-04-23 11:13:25 +02:00
parent 48687fd8a1 c4be740bd6
commit 38b61177f6
48 changed files with 1270 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h>
#include <utils/environment.h>
#include <QDateTime>
#include <QSettings>
@@ -734,6 +735,15 @@ void AndroidConfigurations::load()
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(SettingsGroup);
m_config = AndroidConfig(*settings);
if (m_config.antLocation.isEmpty()) {
Utils::Environment env = Utils::Environment::systemEnvironment();
QString location = env.searchInPath(QLatin1String("ant"));
QFileInfo fi(location);
if (fi.exists() && fi.isExecutable() && !fi.isDir())
m_config.antLocation = Utils::FileName::fromString(location);
}
settings->endGroup();
}