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

Adapt to upstream changes

Browse Source 
Change-Id: Ibdbd3abcfd65b091744451830625e2135c6573d9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2020-01-27 22:46:18 +02:00
committed by Orgad Shaneh
parent b418e205cf
commit b6f137afef
8 changed files with 147 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/fossil/fossilclient.cpp
View File

@@ -243,7 +243,7 @@ QString FossilClient::makeVersionString(unsigned version)
.arg(versionPart(version));
}
FossilClient::FossilClient() : VcsBase::VcsBaseClient(new FossilSettings)
FossilClient::FossilClient(FossilSettings *settings) : VcsBase::VcsBaseClient(settings)
{
setDiffConfigCreator([this](QToolBar *toolBar) {
return new FossilDiffConfig(this, toolBar);
@@ -825,10 +825,8 @@ QString FossilClient::findTopLevelForFile(const QFileInfo &file) const
{
const QString repositoryCheckFile = Constants::FOSSILREPO;
return file.isDir() ?
VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absoluteFilePath(),
repositoryCheckFile) :
VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absolutePath(),
repositoryCheckFile);
VcsBase::findRepositoryForDirectory(file.absoluteFilePath(), repositoryCheckFile) :
VcsBase::findRepositoryForDirectory(file.absolutePath(), repositoryCheckFile);
}
bool FossilClient::managesFile(const QString &workingDirectory, const QString &fileName) const