diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2014-04-22 08:41:12 +0300 |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2014-04-22 17:43:26 +0200 |
| commit | 65cd8ea4c28e7584b24b5dd58a816cc9e292d87b (patch) | |
| tree | 2d44e9b24b8fa5691ec167cddeb6dc6d4e1614cd /src/plugins/git/gitclient.h | |
| parent | 63efa8ba452dd964c1a8bfa870528be6bc45bcf7 (diff) | |
| download | qt-creator-65cd8ea4c28e7584b24b5dd58a816cc9e292d87b.tar.gz | |
Git: Fix config encoding on Windows
This fixes commit d72b4851b45ace311f8813fd4854a2a8e36ab8af
which has removed the conversion from Utf-8 on Windows.
Task-number: QTCREATORBUG-12092
Change-Id: I83c4d2d5eacb79ca99ef0b6f385344689582079e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index b5dd5fd474..b9471a0bb9 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -281,8 +281,6 @@ public: const QString &messge, QString *name, QString *errorMessage = 0); - QByteArray readConfig(const QString &workingDirectory, const QString &configVar) const; - QString readConfigValue(const QString &workingDirectory, const QString &configVar) const; QTextCodec *encoding(const QString &workingDirectory, const QByteArray &configVar) const; @@ -347,6 +345,7 @@ private slots: void fetchFinished(const QVariant &cookie); private: + QByteArray readConfigBytes(const QString &workingDirectory, const QString &configVar) const; QTextCodec *getSourceCodec(const QString &file) const; VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty, const QString &dynamicPropertyValue) const; |