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/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
This commit is contained in:
Eike Ziller
2013-06-25 10:14:14 +02:00
parent 72b06779ab c59ba462ad
commit e8469a2bab
376 changed files with 3762 additions and 2070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/basefilewizard.cpp
View File

@@ -100,8 +100,9 @@ void BaseFileWizardParameterData::clear()
/*!
\class Core::BaseFileWizardParameters
\brief Parameter class for passing parameters to instances of class Wizard
containing name, icon and such.
\brief The BaseFileWizardParameters class is a parameter class for
passing parameters to instances of the class Wizard containing name, icon,
and so on.
\sa Core::GeneratedFile, Core::BaseFileWizard, Core::StandardFileWizard
\sa Core::Internal::WizardEventLoop
@@ -341,7 +342,8 @@ void WizardEventLoop::rejected()
/*!
\class Core::BaseFileWizard
\brief A generic wizard for creating files.
\brief The BaseFileWizard class implements a generic wizard for
creating files.
The abstract methods:
\list
@@ -780,7 +782,8 @@ QString BaseFileWizard::preferredSuffix(const QString &mimeType)
/*!
\class Core::StandardFileWizard
\brief Convenience class for creating one file.
\brief The StandardFileWizard class is a convenience class for
creating one file.
It uses Utils::FileWizardDialog and introduces a new virtual to generate the
files from path and name.