Eike Ziller 185fe0c705 Merge remote-tracking branch 'origin/4.6' ...

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

2018-04-17 10:09:35 +02:00

21 KiB

Raw Blame History

View Raw