feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Do not ask to rebuild after editing CMakeLists.txt files

Browse Source 
This happens automatically now, do not bother the user with that
anymore.

Change-Id: Icc411e74ea5de42037f3718c6b75cc15772a64b9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-02-12 15:32:27 +01:00
parent c1a914197c
commit 761d480453
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
View File

@@ -35,7 +35,6 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -62,37 +61,6 @@ namespace Internal {
// CMakeEditor // CMakeEditor
// //
CMakeEditor::CMakeEditor()
{
}
void CMakeEditor::finalizeInitialization()
{
connect(document(), &IDocument::changed, [this]() {
BaseTextDocument *document = textDocument();
if (!document->isModified())
return;
InfoBar *infoBar = document->infoBar();
Id infoRunCMake("CMakeEditor.RunCMake");
if (!infoBar->canInfoBeAdded(infoRunCMake))
return;
InfoBarEntry info(infoRunCMake,
tr("Changes to cmake files are shown in the project tree after building."),
InfoBarEntry::GlobalSuppressionEnabled);
info.setCustomButtonInfo(tr("Build now"), [document]() {
foreach (Project *p, SessionManager::projects()) {
if (CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(p)) {
if (cmakeProject->isProjectFile(document->filePath())) {
ProjectExplorerPlugin::buildProject(cmakeProject);
break;
}
}
}
});
infoBar->addInfo(info);
});
}
QString CMakeEditor::contextHelpId() const QString CMakeEditor::contextHelpId() const
{ {
int pos = position(); int pos = position();

3
src/plugins/cmakeprojectmanager/cmakeeditor.h
View File

@@ -39,9 +39,6 @@ class CMakeEditor : public TextEditor::BaseTextEditor
Q_OBJECT Q_OBJECT
public: public:
CMakeEditor();
void finalizeInitialization() override;
QString contextHelpId() const override; QString contextHelpId() const override;
friend class CMakeEditorWidget; friend class CMakeEditorWidget;

6
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -36,8 +36,6 @@
#include "cmakeprojectmanager.h" #include "cmakeprojectmanager.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <coreplugin/editormanager/editormanager.h>
#include <cpptools/cppmodelmanager.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/projectinfo.h> #include <cpptools/projectinfo.h>
#include <cpptools/projectpartbuilder.h> #include <cpptools/projectpartbuilder.h>
@@ -251,10 +249,6 @@ void CMakeProject::parseCMakeOutput()
QTC_ASSERT(m_buildDirManager, return); QTC_ASSERT(m_buildDirManager, return);
QTC_ASSERT(activeTarget() && activeTarget()->activeBuildConfiguration(), return); QTC_ASSERT(activeTarget() && activeTarget()->activeBuildConfiguration(), return);
foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments())
if (isProjectFile(document->filePath()))
document->infoBar()->removeInfo("CMakeEditor.RunCMake");
auto activeBC = static_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration()); auto activeBC = static_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
rootProjectNode()->setDisplayName(m_buildDirManager->projectName()); rootProjectNode()->setDisplayName(m_buildDirManager->projectName());