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
..
2018-04-13 12:34:53 +00:00
2018-02-21 09:53:17 +00:00
2017-11-02 09:26:17 +00:00
2016-03-30 15:20:19 +00:00
2013-09-13 15:41:02 +02:00
2016-03-30 15:20:19 +00:00
2016-03-30 15:20:19 +00:00
2017-07-31 14:04:00 +00:00
2013-08-29 08:27:53 +02:00
2018-03-02 09:07:33 +00:00
2008-12-02 12:01:29 +01:00
2018-04-17 04:55:48 +00:00
2016-01-19 16:01:06 +00:00
2018-04-13 10:54:42 +02:00
2017-11-22 08:47:05 +00:00
2013-09-09 12:16:09 +02:00