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

Git: Fix compilation with Qt5

Browse Source 
Change-Id: Ib35095ccdacd13eaf2f599c9b47f7934c5d02591
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Orgad Shaneh
2022-05-12 13:53:56 +03:00
committed by Orgad Shaneh
parent 51be3be2ea
commit 086b47afee
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,8 @@
#include <QToolButton> #include <QToolButton>
#include <QTextCodec> #include <QTextCodec>
#include <vector>
const char GIT_DIRECTORY[] = ".git"; const char GIT_DIRECTORY[] = ".git";
const char HEAD[] = "HEAD"; const char HEAD[] = "HEAD";
const char CHERRY_PICK_HEAD[] = "CHERRY_PICK_HEAD"; const char CHERRY_PICK_HEAD[] = "CHERRY_PICK_HEAD";
@@ -482,7 +484,7 @@ private:
QString m_header; QString m_header;
QString m_body; QString m_body;
QString m_precedes; QString m_precedes;
QStringList m_follows; std::vector<QString> m_follows;
QList<QPointer<VcsCommand>> m_commands; QList<QPointer<VcsCommand>> m_commands;
}; };
@@ -514,7 +516,7 @@ void ShowController::processDescription(const QString &output)
m_header = output.left(lastHeaderLine) + Constants::EXPAND_BRANCHES + '\n'; m_header = output.left(lastHeaderLine) + Constants::EXPAND_BRANCHES + '\n';
m_body = output.mid(lastHeaderLine + 1); m_body = output.mid(lastHeaderLine + 1);
m_precedes = tr("<resolving>"); m_precedes = tr("<resolving>");
m_follows.append(m_precedes); m_follows.push_back(m_precedes);
updateDescription(); updateDescription();
const QString commit = modText.mid(7, 8); const QString commit = modText.mid(7, 8);
m_commands.append(m_instance->execBgCommand( m_commands.append(m_instance->execBgCommand(
@@ -547,7 +549,11 @@ void ShowController::updateDescription()
QString desc = m_header; QString desc = m_header;
if (!m_precedes.isEmpty()) if (!m_precedes.isEmpty())
desc.append("Precedes: " + m_precedes + '\n'); desc.append("Precedes: " + m_precedes + '\n');
QStringList follows = Utils::filtered(m_follows, &QString::size); QStringList follows;
for (const QString &str : m_follows) {
if (!str.isEmpty())
follows.append(str);
}
if (!follows.isEmpty()) if (!follows.isEmpty())
desc.append("Follows: " + follows.join(", ") + '\n'); desc.append("Follows: " + follows.join(", ") + '\n');
desc.append('\n' + m_body); desc.append('\n' + m_body);