diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-11-03 13:44:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-11-03 13:44:37 +0100 |
| commit | 68388a38dd8e1ec06b48b779543097a9f8ba4156 (patch) | |
| tree | c778c8d651a9b6b3327430319f1b82e808300dba /src/plugins/vcsbase/vcsbaseplugin.cpp | |
| parent | 079906a122cae6dd0511a97c0f175488de5c06b5 (diff) | |
| parent | 8de9892c4e877ea7b46940bfc25f203e789de994 (diff) | |
| download | qt-creator-68388a38dd8e1ec06b48b779543097a9f8ba4156.tar.gz | |
Merge remote-tracking branch 'origin/9.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseplugin.cpp')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index a26872d864..52b5f7f371 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -263,8 +263,8 @@ void StateListener::slotStateChanged() } if (state.currentFile.isDir()) { - state.currentFile.clear(); state.currentFileDirectory = state.currentFile.absoluteFilePath(); + state.currentFile.clear(); } else { state.currentFileDirectory = state.currentFile.absolutePath(); state.currentFileName = state.currentFile.fileName(); |