diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-11-29 09:56:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-11-29 09:56:22 +0100 |
| commit | e2baa116cad487d12f2ebccd96f16e99995fcb90 (patch) | |
| tree | d276b7a4294fcc9cd3a0cf937d2f389267524f98 /src/plugins/android/androidrunner.cpp | |
| parent | 4007828820bfd3fa4b5d081052cf5a95fdbd02db (diff) | |
| parent | 78ef474c7139dc0cdaa172d4e468d1b6ae3514aa (diff) | |
| download | qt-creator-e2baa116cad487d12f2ebccd96f16e99995fcb90.tar.gz | |
Merge remote-tracking branch 'origin/4.5'
Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index aae74af3f5..b2952b578e 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -811,7 +811,7 @@ void AndroidRunner::setRunnable(const AndroidRunnable &runnable) void AndroidRunner::launchAVD() { - if (!m_target && !m_target->project()) + if (!m_target || !m_target->project()) return; int deviceAPILevel = AndroidManager::minimumSDK(m_target); |