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:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,8 @@ using namespace ProjectExplorer;
\class ProjectExplorer::ProcessHandle
\brief The ProcessHandle class is a helper class to describe a process.
Encapsulates parameters of a running process, local (PID) or remote (to be done,
address, port, etc).
Encapsulates parameters of a running process, local (PID) or remote (to be
done, address, port, and so on).
*/
ProcessHandle::ProcessHandle(quint64 pid) :
@@ -129,7 +129,8 @@ IRunConfigurationAspect::~IRunConfigurationAspect()
}
/*!
\brief Returns the widget used to configure this run configuration. Ownership is transferred to the caller
Returns the widget used to configure this run configuration. Ownership is
transferred to the caller.
*/
RunConfigWidget *IRunConfigurationAspect::createConfigurationWidget()
@@ -254,7 +255,7 @@ void RunConfiguration::ctor()
}
/*!
\brief Used to find out whether a runconfiguration is enabled
Checks whether a run configuration is enabled.
*/
bool RunConfiguration::isEnabled() const
@@ -331,13 +332,14 @@ bool RunConfiguration::fromMap(const QVariantMap &map)
\brief The IRunConfigurationAspect class provides an additional
configuration aspect.
Aspects are a mechanism to add RunControl-specific options to a RunConfiguration without
subclassing the RunConfiguration for every addition, preventing a combinatorical explosion
of subclasses or the need to add all options to the base class.
Aspects are a mechanism to add RunControl-specific options to a run
configuration without subclassing the run configuration for every addition.
This prevents a combinatorial explosion of subclasses and eliminates
the need to add all options to the base class.
*/
/*!
\brief Return extra aspects.
Returns extra aspects.
\sa ProjectExplorer::IRunConfigurationAspect
*/
@@ -369,23 +371,28 @@ Utils::OutputFormatter *RunConfiguration::createOutputFormatter() const
settings.
The run configuration factory is used for restoring run configurations from
settings. And used to create new runconfigurations in the "Run Settings" Dialog.
For the first case, bool canRestore(Target *parent, const QString &id) and
RunConfiguration* create(Target *parent, const QString &id) are used.
For the second type, the functions QStringList availableCreationIds(Target *parent) and
QString displayNameForType(const QString&) are used to generate a list of creatable
RunConfigurations, and create(..) is used to create it.
settings and for creating new run configurations in the \gui {Run Settings}
dialog.
To restore run configurations, use the
\c {bool canRestore(Target *parent, const QString &id)}
and \c {RunConfiguration* create(Target *parent, const QString &id)}
functions.
To generate a list of creatable run configurations, use the
\c {QStringList availableCreationIds(Target *parent)} and
\c {QString displayNameForType(const QString&)} functions. To create a
run configuration, use \c create().
*/
/*!
\fn QStringList ProjectExplorer::IRunConfigurationFactory::availableCreationIds(Target *parent) const
\brief Used to show the list of possible additons to a target, returns a list of types.
Shows the list of possible additions to a target. Returns a list of types.
*/
/*!
\fn QString ProjectExplorer::IRunConfigurationFactory::displayNameForId(const Core::Id id) const
\brief Used to translate the types to names to display to the user.
Translates the types to names to display to the user.
*/
IRunConfigurationFactory::IRunConfigurationFactory(QObject *parent) :
@@ -461,21 +468,14 @@ QList<IRunConfigurationFactory *> IRunConfigurationFactory::find(Target *parent)
run configuration.
*/
/*!
\fn IRunConfigurationAspect *ProjectExplorer::IRunControlFactory::createRunConfigurationAspect(RunConfiguration *rc)
\brief Return an IRunConfigurationAspect to carry options for RunControls this factory can create.
If no extra options are required it is allowed to return null like the default implementation does.
This is intended to be called from the RunConfiguration constructor, so passing a RunConfiguration
pointer makes no sense because that object is under construction at the time.
*/
/*!
\fn RunConfigWidget *ProjectExplorer::IRunConfigurationAspect::createConfigurationWidget()
\brief Return a widget used to configure this runner. Ownership is transferred to the caller.
Returns a widget used to configure this runner. Ownership is transferred to
the caller.
Return 0 if @p runConfiguration is not suitable for RunControls from this factory, or no user-accessible
Returns 0 if @p \a runConfiguration is not suitable for RunControls from this
factory, or no user-accessible
configuration is required.
*/
@@ -488,6 +488,16 @@ IRunControlFactory::~IRunControlFactory()
{
}
/*!
Returns an IRunConfigurationAspect to carry options for RunControls this
factory can create.
If no extra options are required, it is allowed to return null like the
default implementation does. This function is intended to be called from the
RunConfiguration constructor, so passing a RunConfiguration pointer makes
no sense because that object is under construction at the time.
*/
IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect(RunConfiguration *rc)
{
Q_UNUSED(rc);
@@ -499,18 +509,12 @@ IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect(RunCon
\brief The RunControl class instances represent one item that is run.
*/
/*!
\fn bool ProjectExplorer::RunControl::promptToStop(bool *optionalPrompt = 0) const
\brief Prompt to stop. If 'optionalPrompt' is passed, a "Do not ask again"-
checkbox will show and the result will be returned in '*optionalPrompt'.
*/
/*!
\fn QIcon ProjectExplorer::RunControl::icon() const
\brief Eeturns the icon to be shown in the Outputwindow.
Returns the icon to be shown in the Outputwindow.
TODO the icon differs currently only per "mode", so this is more flexible then it needs to be.
TODO the icon differs currently only per "mode", so this is more flexible
than it needs to be.
*/
RunControl::RunControl(RunConfiguration *runConfiguration, RunMode mode)
@@ -570,6 +574,11 @@ void RunControl::setApplicationProcessHandle(const ProcessHandle &handle)
}
}
/*!
Prompts to stop. If \a optionalPrompt is passed, a \gui {Do not ask again}
checkbox is displayed and the result is returned in \a *optionalPrompt.
*/
bool RunControl::promptToStop(bool *optionalPrompt) const
{
QTC_ASSERT(isRunning(), return true);
@@ -585,7 +594,8 @@ bool RunControl::promptToStop(bool *optionalPrompt) const
}
/*!
\brief Utility to prompt to terminate application with checkable box.
Prompts to terminate the application with the \gui {Do not ask again}
checkbox.
*/
bool RunControl::showPromptToStopDialog(const QString &title,