Merge remote-tracking branch 'origin/4.7'

Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac

src/plugins/android/androiddevice.cpp

@@ -29,7 +29,6 @@
 #include "androidconfigurations.h"
 
 #include <projectexplorer/runconfiguration.h>
-#include <projectexplorer/runnables.h>
 
 #include <utils/url.h>
 

src/plugins/android/androiddevicedialog.cpp

@@ -532,9 +532,7 @@ void AndroidDeviceDialog::devicesRefreshed()
 
     AndroidDeviceInfoList devices = m_futureWatcherRefreshDevices.result();
     QSet<QString> startedAvds = Utils::transform<QSet>(m_connectedDevices,
-                                                       [] (const AndroidDeviceInfo &info) {
-                                                           return info.avdname;
-                                                       });
+                                                       &AndroidDeviceInfo::avdname);
 
     for (const AndroidDeviceInfo &dev : devices)
         if (!startedAvds.contains(dev.avdname))

src/plugins/android/androidplugin.cpp

@@ -62,6 +62,17 @@ using namespace ProjectExplorer::Constants;
 namespace Android {
 namespace Internal {
 
+class AndroidRunConfigurationFactory : public RunConfigurationFactory
+{
+public:
+    AndroidRunConfigurationFactory()
+    {
+        registerRunConfiguration<Android::AndroidRunConfiguration>
+                ("Qt4ProjectManager.AndroidRunConfiguration:");
+        addSupportedTargetDeviceType(Android::Constants::ANDROID_DEVICE_TYPE);
+    }
+};
+
 class AndroidPluginPrivate
 {
 public:
@@ -76,6 +87,7 @@ public:
     JavaEditorFactory javaEditorFactory;
     AndroidPackageInstallationFactory packackeInstallationFactory;
     AndroidManifestEditorFactory manifestEditorFactory;
+    AndroidRunConfigurationFactory runConfigFactory;
 };
 
 AndroidPlugin::~AndroidPlugin()
@@ -97,10 +109,7 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
 
     RunControl::registerWorker(QML_PREVIEW_RUN_MODE, [](RunControl *runControl) -> RunWorker* {
         const Runnable runnable = runControl->runConfiguration()->runnable();
-        QTC_ASSERT(runnable.is<StandardRunnable>(), return nullptr);
-        const StandardRunnable standardRunnable = runnable.as<StandardRunnable>();
-        return new AndroidQmlToolingSupport(runControl, standardRunnable.executable,
-                                            standardRunnable.commandLineArguments);
+        return new AndroidQmlToolingSupport(runControl, runnable.executable, runnable.commandLineArguments);
     }, [](RunConfiguration *runConfig) {
         return runConfig->isEnabled()
                 && runConfig->id().name().startsWith("QmlProjectManager.QmlRunConfiguration")

src/plugins/android/androidsdkmanager.cpp

@@ -313,9 +313,7 @@ SdkPlatformList AndroidSdkManager::installedSdkPlatforms()
 {
     AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
                                                        AndroidSdkPackage::SdkPlatformPackage);
-    return Utils::transform(list, [](AndroidSdkPackage *p) {
-       return static_cast<SdkPlatform *>(p);
-    });
+    return Utils::qobject_container_cast<SdkPlatform *>(list);
 }
 
 const AndroidSdkPackageList &AndroidSdkManager::allSdkPackages()