Merge remote-tracking branch 'origin/4.5'

Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
This commit is contained in:
Eike Ziller
2017-10-09 12:09:27 +02:00
256 changed files with 4735 additions and 4046 deletions

View File

@@ -31,7 +31,6 @@
#include <QVector>
namespace QmlJS {
class ScopeChain;
namespace AST { class SourceLocation; }
}