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

Git: Aspectify settings

Browse Source 
Change-Id: I87dfeba360967cc77cc230811bcd9f67b3ea6e38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-03-16 06:00:25 +01:00
parent f2c34e51e9
commit aa69415ac7
19 changed files with 379 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitclient.h
View File

@@ -140,6 +140,7 @@ public:
explicit GitClient(GitSettings *settings);
static GitClient *instance();
static GitSettings &settings();
Utils::FilePath vcsBinary() const override;
unsigned gitVersion(QString *errorMessage = nullptr) const;
@@ -416,14 +417,14 @@ private:
const QString &gitCommand, ContinueCommandMode continueMode);
mutable Utils::FilePath m_gitVersionForBinary;
mutable unsigned m_cachedGitVersion;
mutable unsigned m_cachedGitVersion = 0;
QString m_gitQtcEditor;
QMap<QString, StashInfo> m_stashInfo;
QString m_pushFallbackCommand;
QString m_diffCommit;
QStringList m_updatedSubmodules;
bool m_disableEditor;
bool m_disableEditor = false;
QFutureSynchronizer<void> m_synchronizer; // for commit updates
};