diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-09-10 18:03:02 +0300 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-10 18:49:37 +0000 |
| commit | 0780c1d7634d4e7c9314deba14f370d1f2a14ea6 (patch) | |
| tree | f6ea292869836cd2c808418d78bc1403749cfc9f | |
| parent | 14ddaae54e2ceaf9604df9dfb16060a4f31ac806 (diff) | |
| download | qt-creator-0780c1d7634d4e7c9314deba14f370d1f2a14ea6.tar.gz | |
Git: Fix compilation with GCC 4.8
Change-Id: I47e2ac73a7afdd5c44c054bab54bc454973a1fa7
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 22e29e14e7..9d5eff752c 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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); |