Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/qtc41-beta into lp://staging/qtcreator-plugin-ubuntu

UbuntuPlugin.pro (+6/-6)
src/ubuntu/clicktoolchain.cpp (+25/-14)
src/ubuntu/clicktoolchain.h (+4/-3)
src/ubuntu/device/container/containerdeviceprocess.cpp (+17/-15)
src/ubuntu/device/container/containerdeviceprocess.h (+1/-3)
src/ubuntu/device/container/ubuntulocaldeployconfiguration.cpp (+1/-1)
src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp (+21/-3)
src/ubuntu/device/container/ubuntulocalrunconfiguration.h (+8/-8)
src/ubuntu/device/container/ubuntulocalrunconfigurationfactory.cpp (+1/-1)
src/ubuntu/device/container/ubuntulocalruncontrolfactory.cpp (+54/-22)
src/ubuntu/device/container/ubuntulocalscopedebugsupport.cpp (+7/-8)
src/ubuntu/device/container/ubuntulocalscopedebugsupport.h (+1/-1)
src/ubuntu/device/remote/abstractremoterunsupport.cpp (+6/-5)
src/ubuntu/device/remote/abstractremoterunsupport.h (+1/-1)
src/ubuntu/device/remote/ubuntudeploystepfactory.cpp (+25/-38)
src/ubuntu/device/remote/ubuntudeploystepfactory.h (+4/-5)
src/ubuntu/device/remote/ubuntudevice.cpp (+9/-13)
src/ubuntu/device/remote/ubuntudevice.h (+1/-4)
src/ubuntu/device/remote/ubuntudevicesignaloperation.cpp (+3/-3)
src/ubuntu/device/remote/ubuntudevicesignaloperation.h (+3/-3)
src/ubuntu/device/remote/ubuntudirectuploadstep.cpp (+16/-13)
src/ubuntu/device/remote/ubuntudirectuploadstep.h (+3/-0)
src/ubuntu/device/remote/ubunturemoteanalyzesupport.cpp (+18/-15)
src/ubuntu/device/remote/ubunturemoteanalyzesupport.h (+2/-2)
src/ubuntu/device/remote/ubunturemotedebugsupport.cpp (+17/-9)
src/ubuntu/device/remote/ubunturemoterunconfiguration.cpp (+20/-5)
src/ubuntu/device/remote/ubunturemoterunconfiguration.h (+8/-8)
src/ubuntu/device/remote/ubunturemoteruncontrol.cpp (+2/-2)
src/ubuntu/device/remote/ubunturemoteruncontrolfactory.cpp (+51/-20)
src/ubuntu/device/remote/ubunturemoterunner.cpp (+1/-1)
src/ubuntu/localportsmanager.cpp (+5/-5)
src/ubuntu/ubuntuabstractguieditordocument.cpp (+0/-10)
src/ubuntu/ubuntuabstractguieditordocument.h (+0/-4)
src/ubuntu/ubuntuclickdialog.cpp (+1/-1)
src/ubuntu/ubuntuclicktool.cpp (+17/-6)
src/ubuntu/ubuntuclicktool.h (+3/-1)
src/ubuntu/ubuntucmakecache.cpp (+1/-0)
src/ubuntu/ubuntuconstants.h (+2/-0)
src/ubuntu/ubuntudevicemode.cpp (+0/-6)
src/ubuntu/ubuntudevicemode.h (+0/-3)
src/ubuntu/ubuntudevicesmodel.cpp (+45/-44)
src/ubuntu/ubuntudevicesmodel.h (+9/-9)
src/ubuntu/ubuntufixmanifeststep.cpp (+2/-1)
src/ubuntu/ubuntufixmanifeststep.h (+1/-1)
src/ubuntu/ubuntuhtmlbuildconfiguration.cpp (+2/-1)
src/ubuntu/ubuntukitmanager.cpp (+17/-7)
src/ubuntu/ubuntumenu.cpp (+1/-1)
src/ubuntu/ubuntupackagestep.cpp (+19/-17)
src/ubuntu/ubuntupackagestep.h (+1/-1)
src/ubuntu/ubuntupackagingmode.cpp (+0/-6)
src/ubuntu/ubuntupackagingmode.h (+0/-3)
src/ubuntu/ubuntupackagingmodel.cpp (+2/-2)
src/ubuntu/ubuntuplugin.cpp (+2/-2)
src/ubuntu/ubuntuplugin.h (+0/-1)
src/ubuntu/ubuntuproject.cpp (+7/-8)
src/ubuntu/ubuntuproject.h (+4/-2)
src/ubuntu/ubuntuprojectfile.cpp (+0/-8)
src/ubuntu/ubuntuprojectfile.h (+0/-4)
src/ubuntu/ubuntuprojectnode.cpp (+1/-1)
src/ubuntu/ubuntuqmlbuildconfiguration.cpp (+33/-38)
src/ubuntu/ubuntuqmlbuildconfiguration.h (+7/-7)
src/ubuntu/ubuntuqtversion.cpp (+50/-15)
src/ubuntu/ubuntuqtversion.h (+5/-3)
src/ubuntu/ubuntuwelcomemode.cpp (+5/-1)
src/ubuntu/wizards/createtargetwizard.cpp (+1/-1)
src/ubuntu/wizards/ubuntufatpackagingwizard.cpp (+1/-1)
src/ubuntu/wizards/ubuntufirstrunwizard.cpp (+1/-1)
src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp (+9/-6)
src/ubuntu/wizards/ubuntuprojectapplicationwizard.h (+1/-1)
src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp (+5/-5)