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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
This commit is contained in:
Eike Ziller
2016-12-09 12:42:01 +01:00
parent 77b8198c2b 5071dd80cb
commit c175f1e62f
26 changed files with 200 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,6 +285,8 @@ QString AndroidManager::androidNameForApiLevel(int x)
return QLatin1String("Android 6.0");
case 24:
return QLatin1String("Android 7.0");
case 25:
return QLatin1String("Android 7.1");
default:
return tr("Unknown Android version. API Level: %1").arg(QString::number(x));
}

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

@@ -668,8 +668,9 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)
logcatReadStandardOutput();
QTC_ASSERT(!m_psIsAlive, /**/);
m_psIsAlive.reset(new QProcess);
connect(m_psIsAlive.get(), &QIODevice::readyRead, [this](){
if (!m_psIsAlive->readAllStandardOutput().simplified().isEmpty())
m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels);
connect(m_psIsAlive.get(), &QProcess::readyRead, [this](){
if (!m_psIsAlive->readAll().simplified().isEmpty())
onProcessIdChanged(-1);
});
m_psIsAlive->start(m_adb, selector() << QStringLiteral("shell")