Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

2013-03-26 13:10:09 +01:00
parent 599be01a67 92207c96b7
commit 96a5245d8e
163 changed files with 110 additions and 404 deletions
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -35,6 +35,7 @@
 #include "cdb/cdbengine.h"

 #include <coreplugin/icore.h>
+#include <projectexplorer/toolchain.h>
 #include <utils/pathchooser.h>
 #include <utils/fancylineedit.h>
 #include <utils/qtcassert.h>