feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
This commit is contained in:
Eike Ziller
2012-09-19 18:02:46 +02:00
parent c0321ac305 44177392ec
commit b947861c59
104 changed files with 2560 additions and 2030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -309,7 +309,8 @@ void FetchContext::startWritePatchFile()
void FetchContext::startCherryPick()
{
VcsBase::VcsBaseOutputWindow::instance()->popup(); // Point user to errors.
// Point user to errors.
VcsBase::VcsBaseOutputWindow::instance()->popup(Core::IOutputPane::ModeSwitch | Core::IOutputPane::WithFocus);
VcsBase::VcsBaseOutputWindow::instance()->append(tr("Cherry-picking %1...").arg(m_patchFileName));
QStringList args;
args << QLatin1String("cherry-pick") << QLatin1String("FETCH_HEAD");