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

Git: Fix compilation with GCC 4.8

Browse Source 
Change-Id: I47e2ac73a7afdd5c44c054bab54bc454973a1fa7
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-09-10 18:03:02 +03:00
committed by Robert Loehning
parent 14ddaae54e
commit 0780c1d763
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gitclient.cpp
View File

@@ -158,8 +158,8 @@ void BaseController::runCommand(const QList<QStringList> &args, QTextCodec *code
m_command = new VcsCommand(m_directory, gitClient()->processEnvironment());
m_command->setCodec(codec ? codec : EditorManager::defaultTextCodec());
connect(m_command, &VcsCommand::stdOutText, this, &BaseController::processOutput);
connect(m_command, &VcsCommand::finished, this, &BaseController::reloadFinished);
connect(m_command.data(), &VcsCommand::stdOutText, this, &BaseController::processOutput);
connect(m_command.data(), &VcsCommand::finished, this, &BaseController::reloadFinished);
m_command->addFlags(diffExecutionFlags());
foreach (const QStringList &arg, args) {
@@ -173,7 +173,7 @@ void BaseController::runCommand(const QList<QStringList> &args, QTextCodec *code
void BaseController::processDiff(const QString &output)
{
m_command = 0;
m_command.clear();
bool ok;
QList<FileData> fileDataList = DiffUtils::readPatch(output, &ok);