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

Android: android.bat needs a special environment

Browse Source 
See the below task for details:

Task-number: QTCREATORBUG-10575
Change-Id: I7756d8780b33ede4c3d4eac7e281c9eabfa47e35
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-11-19 17:25:32 +01:00
parent c9c0f80147
commit 721d6546a6
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidsettingswidget.cpp
View File

@@ -35,6 +35,10 @@
#include "androidconstants.h"
#include "androidtoolchain.h"
#ifdef Q_OS_WIN
#include <utils/winutils.h>
#endif
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/kitmanager.h>
@@ -434,8 +438,12 @@ void AndroidSettingsWidget::manageAVD()
QProcess *avdProcess = new QProcess();
connect(this, SIGNAL(destroyed()), avdProcess, SLOT(deleteLater()));
connect(avdProcess, SIGNAL(finished(int)), avdProcess, SLOT(deleteLater()));
avdProcess->start(AndroidConfigurations::instance().androidToolPath().toString(),
QStringList() << QLatin1String("avd"));
avdProcess->setProcessEnvironment(AndroidConfigurations::instance().androidToolEnvironment().toProcessEnvironment());
QString executable = AndroidConfigurations::instance().androidToolPath().toString();
QStringList arguments = QStringList() << QLatin1String("avd");
avdProcess->start(executable, arguments);
}