Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
This commit is contained in:
con
2010-05-11 13:39:21 +02:00
84 changed files with 2578 additions and 1717 deletions

View File

@@ -34,6 +34,8 @@
#include "cmakerunconfiguration.h"
#include "cmakebuildconfiguration.h"
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <QtGui/QApplication>
#include <QtGui/QStyle>
@@ -131,6 +133,12 @@ void CMakeTarget::updateRunConfigurations()
CMakeRunConfiguration *rc = it.value();
removeRunConfiguration(rc);
}
if (runConfigurations().isEmpty()) {
// Oh no, no run configuration,
// create a custom executable run configuration
ProjectExplorer::CustomExecutableRunConfiguration *rc = new ProjectExplorer::CustomExecutableRunConfiguration(this);
addRunConfiguration(rc);
}
}
// -------------------------------------------------------------------------