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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/plugins/android/androidrunnable.h
	src/plugins/android/androidrunner.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
	src/plugins/qmakeprojectmanager/qmakeproject.cpp
	src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp

Change-Id: I68093d44cfd672347eab82459ff70c21a32297ce
This commit is contained in:
Eike Ziller
2018-04-17 10:09:35 +02:00
parent 32a219f5c1 9a946decc3
commit 185fe0c705
49 changed files with 1014 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidrunner.h
View File

@@ -43,7 +43,7 @@
namespace Android {
namespace Internal {
class AndroidRunnerWorker;
class AndroidRunnerWorkerBase;
class AndroidRunner : public ProjectExplorer::RunWorker
{
@@ -88,7 +88,7 @@ private:
QString m_launchedAVDName;
QThread m_thread;
QTimer m_checkAVDTimer;
QScopedPointer<AndroidRunnerWorker> m_worker;
QScopedPointer<AndroidRunnerWorkerBase> m_worker;
QPointer<ProjectExplorer::Target> m_target;
Utils::Port m_gdbServerPort;
QUrl m_qmlServer;