diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-05 13:32:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-05 13:32:28 +0100 |
| commit | 2b954973d80015664e79a794124f628320d56001 (patch) | |
| tree | 5ec36d3a3a38b87cdef512d863590658764eaa5c /src/plugins/cmakeprojectmanager | |
| parent | 1e2d2665414d7e62bd816e542fd3ea0b568c0b69 (diff) | |
| parent | 4a1b6c1fd836c51a24f18fcbcccef4254fedbae4 (diff) | |
| download | qt-creator-2b954973d80015664e79a794124f628320d56001.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index b0f5b8b49b..476d3da3d9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -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; |