forked from qt-creator/qt-creator
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:
@@ -31,7 +31,6 @@
|
||||
#include <QVector>
|
||||
|
||||
namespace QmlJS {
|
||||
class ScopeChain;
|
||||
namespace AST { class SourceLocation; }
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user