Merge remote-tracking branch 'origin/3.4'

This commit is contained in:
Eike Ziller
2015-03-05 13:32:28 +01:00
318 changed files with 1345 additions and 2178 deletions

View File

@@ -35,15 +35,17 @@
#include "cmakesettingspage.h"
#include "cmaketoolmanager.h"
#include <utils/synchronousprocess.h>
#include <coreplugin/icore.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <projectexplorer/projecttree.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projecttree.h>
#include <utils/synchronousprocess.h>
#include <QAction>
#include <QDateTime>
using namespace CMakeProjectManager::Internal;