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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399
This commit is contained in:
Eike Ziller
2022-11-03 13:44:37 +01:00
parent 079906a122 8de9892c4e
commit 68388a38dd
206 changed files with 2160 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

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