diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-16 16:54:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-16 16:54:50 +0200 |
| commit | 6d1cc5869786509398e8a78ade97637ea8458208 (patch) | |
| tree | 08f25170685a5889628f02933426fdcbdf632f81 /src/plugins/git/gitsubmiteditor.h | |
| parent | d46a73eacf76712d76d13ffd00423325dc8d9237 (diff) | |
| parent | 1398480f3ab050a8d2076f3712049bd9fd8a2358 (diff) | |
| download | qt-creator-6d1cc5869786509398e8a78ade97637ea8458208.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/plugins/clangcodemodel/test/clangcompletion_test.cpp
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
src/plugins/projectexplorer/projectexplorer.pro
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
src/plugins/vcsbase/vcsplugin.cpp
src/shared/qbs
Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
Diffstat (limited to 'src/plugins/git/gitsubmiteditor.h')
| -rw-r--r-- | src/plugins/git/gitsubmiteditor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index 452ccdaff1..45c2a5e87c 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -53,7 +53,7 @@ public: void setCommitData(const CommitData &); GitSubmitEditorPanelData panelData() const; - bool forceClose() const { return m_forceClose; } + bool forceClose() { updateFileModel(); return m_forceClose; } CommitType commitType() const { return m_commitType; } QString amendSHA1() const; |