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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
This commit is contained in:
Eike Ziller
2017-11-29 09:56:22 +01:00
parent 4007828820 78ef474c71
commit e2baa116ca
17 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidrunner.cpp
View File

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