Merge remote-tracking branch 'origin/4.7'

Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I72882df605bc3fc8a8d20118fd4e49207ac92664

src/plugins/cpptools/cppvirtualfunctionassistprovider.h

@@ -40,6 +40,7 @@ namespace CppTools {
 
 class CPPTOOLS_EXPORT VirtualFunctionAssistProvider : public TextEditor::IAssistProvider
 {
+    Q_OBJECT
 public:
     VirtualFunctionAssistProvider();