diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
| commit | 63ff7452137958215988d9f2f6066de955500be0 (patch) | |
| tree | d645a26ae9db68cdbf37e9fd997a221c81eea008 /src/plugins/coreplugin/featureprovider.cpp | |
| parent | 19c735a4912487e8038f08ea0b617ccce62cd1a3 (diff) | |
| parent | a12a9f491cb31ff5c22f1051bb22ccfef6c65217 (diff) | |
| download | qt-creator-63ff7452137958215988d9f2f6066de955500be0.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
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
Diffstat (limited to 'src/plugins/coreplugin/featureprovider.cpp')
| -rw-r--r-- | src/plugins/coreplugin/featureprovider.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/featureprovider.cpp b/src/plugins/coreplugin/featureprovider.cpp index ba6510309a..a992e63a67 100644 --- a/src/plugins/coreplugin/featureprovider.cpp +++ b/src/plugins/coreplugin/featureprovider.cpp @@ -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. */ |