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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
This commit is contained in:
Eike Ziller
2015-09-01 12:57:51 +02:00
parent fb73a87033 a80f4d179b
commit 3b1a966cc8
62 changed files with 2582 additions and 2354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,7 @@ AndroidRunner::AndroidRunner(QObject *parent,
qDebug() << tr("No free ports available on host for QML debugging."));
m_qmlPort = server.serverPort();
} else {
m_qmlPort = -1;
m_qmlPort = 0;
}
ProjectExplorer::Target *target = runConfig->target();
m_useLocalQtLibs = AndroidManager::useLocalLibs(target);