Merge remote-tracking branch 'origin/4.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b

src/plugins/autotest/testvisitor.h

@@ -51,6 +51,7 @@ public:
     virtual ~TestVisitor();
 
     QMap<QString, TestCodeLocationAndType> privateSlots() const { return m_privSlots; }
+    bool resultValid() const { return m_valid; }
 
     bool visit(CPlusPlus::Class *symbol);
 
@@ -58,6 +59,7 @@ private:
     CppTools::SymbolFinder m_symbolFinder;
     QString m_className;
     QMap<QString, TestCodeLocationAndType> m_privSlots;
+    bool m_valid = false;
 };
 
 class TestAstVisitor : public CPlusPlus::ASTVisitor