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: If876d7f91172ddd3398c6a37ad8f14b73a3e55ee
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2022-07-27 10:58:45 +02:00
parent 8060ca5204
commit c06a40afcd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/fossil/fossilplugin.cpp
View File

@@ -767,7 +767,7 @@ void FossilPluginPrivate::createRepository()
if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject()) if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject())
directory = currentProject->projectDirectory(); directory = currentProject->projectDirectory();
// Prompt for a directory that is not under version control yet // Prompt for a directory that is not under version control yet
QWidget *mw = Core::ICore::mainWindow(); QWidget *mw = Core::ICore::dialogParent();
do { do {
directory = FileUtils::getExistingDirectory(nullptr, tr("Choose Checkout Directory"), directory); directory = FileUtils::getExistingDirectory(nullptr, tr("Choose Checkout Directory"), directory);
if (directory.isEmpty()) if (directory.isEmpty())

2
plugins/fossil/fossilsettings.cpp
View File

@@ -177,6 +177,7 @@ OptionsPageWidget::OptionsPageWidget(const std::function<void()> &onApply, Fossi
Group { Group {
Title(tr("Miscellaneous")), Title(tr("Miscellaneous")),
Column {
Row { Row {
s.logCount, s.logCount,
s.timelineWidth, s.timelineWidth,
@@ -185,6 +186,7 @@ OptionsPageWidget::OptionsPageWidget(const std::function<void()> &onApply, Fossi
}, },
s.disableAutosync s.disableAutosync
}, },
},
Stretch() Stretch()
}.attachTo(this); }.attachTo(this);