Merge remote-tracking branch 'origin/2.7'

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

src/plugins/android/androidconfigurations.cpp

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

src/plugins/android/androidsettingswidget.cpp

@@ -278,6 +278,7 @@ void AndroidSettingsWidget::sdkLocationEditingFinished()
         return;
     }
     m_androidConfig.sdkLocation = location;
+    searchForAnt(location.toString());
     saveSettings(true);
     m_AVDModel.setAvdList(AndroidConfigurations::instance().androidVirtualDevices());
     m_ui->AVDManagerFrame->setEnabled(true);
@@ -289,9 +290,28 @@ void AndroidSettingsWidget::ndkLocationEditingFinished()
     m_androidConfig.toolchainHost.clear(); // force toolchain host detection
     if (!checkNDK(location))
         return;
+    searchForAnt(location.toString());
     saveSettings(true);
 }
 
+void AndroidSettingsWidget::searchForAnt(const QString &location)
+{
+    if (!m_androidConfig.antLocation.isEmpty())
+            return;
+    if (location.isEmpty())
+        return;
+    QDir parentFolder = QFileInfo(location).absoluteDir();
+    foreach (const QString &file, parentFolder.entryList()) {
+        if (file.startsWith(QLatin1String("apache-ant"))) {
+            QString ant = parentFolder.absolutePath() + QLatin1Char('/') + file + QLatin1String("/bin/ant.bat");
+            if (QFileInfo(ant).exists()) {
+                m_androidConfig.antLocation = Utils::FileName::fromString(ant);
+                m_ui->AntLocationLineEdit->setText(ant);
+            }
+        }
+    }
+}
+
 void AndroidSettingsWidget::antLocationEditingFinished()
 {
     Utils::FileName location = Utils::FileName::fromUserInput(m_ui->AntLocationLineEdit->text());

src/plugins/android/androidsettingswidget.h

@@ -75,6 +75,7 @@ public:
 private slots:
     void sdkLocationEditingFinished();
     void ndkLocationEditingFinished();
+    void searchForAnt(const QString &location);
     void antLocationEditingFinished();
     void openJDKLocationEditingFinished();
     void browseSDKLocation();