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

Android: Fix in source builds with Qt 5.2

Browse Source 
Now the build directory is by default android-build, so by default the
source and build directory don't clash anymore.

Task-number: QTCREATORBUG-10661
Change-Id: I054bd3790f9bc9720536aac301bee192cb9f0429
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-11-06 13:06:10 +01:00
parent f788b7c9fd
commit ae55018548
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -34,6 +34,7 @@
#include "javaparser.h"
#include "androidmanager.h"
#include "androidconstants.h"
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
@@ -232,7 +233,7 @@ bool AndroidDeployQtStep::init()
else if (m_deployAction == BundleLibrariesDeployment)
deploymentMethod = QLatin1String("bundled");
QString outputDir = bc->buildDirectory().appendPath(QLatin1String("android")).toString();
QString outputDir = bc->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)).toString();
QStringList arguments;
arguments << QLatin1String("--input")