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

10
src/plugins/coreplugin/featureprovider.cpp
View File

@@ -39,8 +39,10 @@
The features provided by an object in the object pool implementing IFeatureProvider
will be respected by wizards implementing IWizard.
This feature set, provided by all instances of IFeatureProvider in the object pool, is checked against IWizard::requiredFeatures()
and only if all required features are available the wizard is displayed when creating a new file or project.
This feature set, provided by all instances of IFeatureProvider in the
object pool, is checked against \c IWizard::requiredFeatures()
and only if all required features are available, the wizard is displayed
when creating a new file or project.
Qt4VersionManager creates an instance of IFeatureProvider and provides Qt specific features for the available
versions of Qt.
@@ -95,11 +97,11 @@
/*!
\fn bool FeatureSet::contains(const Feature &feature) const
\returns true if the \param features is available.
Returns true if \a feature is available.
*/
/*!
\fn bool FeatureSet::contains(const FeatureSet &features) const
\returns true if all \param features are available.
Returns true if all \a features are available.
*/