summaryrefslogtreecommitdiffstats
path: root/plugins/fossil
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2022-07-27 10:58:45 +0200
committerChristian Stenger <christian.stenger@qt.io>2022-07-27 09:37:02 +0000
commitc06a40afcded4f00561316418c2802b93eb49593 (patch)
treec01e3d8ccebd19db14a40333b52d7de9d8f07388 /plugins/fossil
parent8060ca52041b780ecc5d38f3b8704f6c2417a4df (diff)
Adapt to upstream changes
Change-Id: If876d7f91172ddd3398c6a37ad8f14b73a3e55ee Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'plugins/fossil')
-rw-r--r--plugins/fossil/fossilplugin.cpp2
-rw-r--r--plugins/fossil/fossilsettings.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index 63c51a2..d99ab08 100644
--- a/plugins/fossil/fossilplugin.cpp
+++ b/plugins/fossil/fossilplugin.cpp
@@ -767,7 +767,7 @@ void FossilPluginPrivate::createRepository()
if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject())
directory = currentProject->projectDirectory();
// Prompt for a directory that is not under version control yet
- QWidget *mw = Core::ICore::mainWindow();
+ QWidget *mw = Core::ICore::dialogParent();
do {
directory = FileUtils::getExistingDirectory(nullptr, tr("Choose Checkout Directory"), directory);
if (directory.isEmpty())
diff --git a/plugins/fossil/fossilsettings.cpp b/plugins/fossil/fossilsettings.cpp
index fc5d63b..ef3f62f 100644
--- a/plugins/fossil/fossilsettings.cpp
+++ b/plugins/fossil/fossilsettings.cpp
@@ -177,13 +177,15 @@ OptionsPageWidget::OptionsPageWidget(const std::function<void()> &onApply, Fossi
Group {
Title(tr("Miscellaneous")),
- Row {
+ Column {
+ Row {
s.logCount,
s.timelineWidth,
s.timeout,
Stretch()
+ },
+ s.disableAutosync
},
- s.disableAutosync
},
Stretch()