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

12
src/plugins/projectexplorer/session.cpp
View File

@@ -67,8 +67,8 @@ namespace ProjectExplorer {
\brief The SessionManager class manages sessions.
TODO the interface of this class is not really great.
The implementation suffers that all the functions from the
public interface just wrap around functions which do the actual work
The implementation suffers from that all the functions from the
public interface just wrap around functions which do the actual work.
This could be improved.
*/
@@ -648,7 +648,7 @@ void SessionManager::removeProjects(QList<Project *> remove)
}
/*!
\brief Let other plugins store persistent values within the session file.
Lets other plugins store persistent values within the session file.
*/
void SessionManager::setValue(const QString &name, const QVariant &value)
@@ -691,7 +691,7 @@ FileName SessionManager::sessionNameToFileName(const QString &session)
}
/*!
\brief Just creates a new session (Does not actually create the file).
Creates \a session, but does not actually create the file.
*/
bool SessionManager::createSession(const QString &session)
@@ -725,7 +725,7 @@ bool SessionManager::confirmSessionDelete(const QString &session)
}
/*!
\brief Deletes session name from session list and file from disk.
Deletes \a session name from session list and the file from disk.
*/
bool SessionManager::deleteSession(const QString &session)
{
@@ -830,7 +830,7 @@ void SessionManagerPrivate::restoreEditors(const PersistentSettingsReader &reade
}
/*!
\brief Loads a session, takes a session name (not filename).
Loads a session, takes a session name (not filename).
*/
void SessionManagerPrivate::restoreProjects(const QStringList &fileList)
{