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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/extensionsystem/pluginmanager.cpp
	src/plugins/coreplugin/documentmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: Ibc2adc40bad6f10df94c50d66e78dc3f4bcb84c0
This commit is contained in:
Eike Ziller
2013-06-05 14:19:43 +02:00
parent c770e7074f ea3ac259d0
commit a503f8bee0
343 changed files with 5210 additions and 9384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -104,6 +104,9 @@ bool ProcessHandle::equals(const ProcessHandle &rhs) const
}
/*!
\brief Returns the widget used to configure this run configuration. Ownership is transferred to the caller
*/
RunConfigWidget *IRunConfigurationAspect::createConfigurationWidget()
{
return 0;
@@ -200,12 +203,6 @@ bool RunConfiguration::ensureConfigured(QString *errorMessage)
}
/*!
\fn virtual QWidget *ProjectExplorer::RunConfiguration::createConfigurationWidget()
\brief Returns the widget used to configure this run configuration. Ownership is transferred to the caller
*/
BuildConfiguration *RunConfiguration::activeBuildConfiguration() const
{
if (!target())