Merge remote-tracking branch 'origin/2.6'

2012-08-17 09:09:00 +02:00
parent 20231b769d fd78ec9f42
commit b3e465c9d4
75 changed files with 637 additions and 1231 deletions
--- a/src/libs/cplusplus/OverviewModel.cpp
+++ b/src/libs/cplusplus/OverviewModel.cpp
@@ -35,9 +35,6 @@
 #include <Literals.h>
 #include <Symbols.h>

-#include <QFile>
-#include <QDebug>
-
 using namespace CPlusPlus;

 OverviewModel::OverviewModel(QObject *parent)