diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
| commit | 0fb641c90e64054a28a39e3f48d96f953399805a (patch) | |
| tree | 504f097db01334a87316f8e825f1db0cba6bfba1 /src/plugins/git/gitclient.h | |
| parent | f4520bafaccb0832266f8d88f254e910ed7a23f4 (diff) | |
| parent | 4b2cc015f867941a7ae35a38d81ec9daa5616711 (diff) | |
| download | qt-creator-0fb641c90e64054a28a39e3f48d96f953399805a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
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 ac964380f0..c95e7fef18 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; @@ -345,6 +343,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; |