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

Git: Fix config encoding on Windows

Browse Source 
This fixes commit d72b4851b4
which has removed the conversion from Utf-8 on Windows.

Task-number: QTCREATORBUG-12092
Change-Id: I83c4d2d5eacb79ca99ef0b6f385344689582079e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Peter Kümmel
2014-04-22 08:41:12 +03:00
parent 63efa8ba45
commit 65cd8ea4c2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;