diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-03-18 09:44:24 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-03-18 09:44:24 +0100 |
| commit | b7b1626519eee92b328f16fe4a8d90f01b76b237 (patch) | |
| tree | 50d948fec7c4cbdd5c79d954873743904ca8d771 | |
| parent | 93c6695c1948f68da9f3a2388da2653ae72e13b5 (diff) | |
| parent | bea9b5e969b6d30b79d9608d68dd9c95dffc593e (diff) | |
Merge remote-tracking branch 'origin/4.15'
Change-Id: Icee22c01e5fc48638111312152cc6b65cebfe31d
| -rw-r--r-- | plugins/haskell/haskellbuildconfiguration.cpp | 4 | ||||
| -rw-r--r-- | plugins/haskell/optionspage.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/haskell/haskellbuildconfiguration.cpp b/plugins/haskell/haskellbuildconfiguration.cpp index af7e147..160e2d1 100644 --- a/plugins/haskell/haskellbuildconfiguration.cpp +++ b/plugins/haskell/haskellbuildconfiguration.cpp @@ -112,14 +112,14 @@ HaskellBuildConfigurationWidget::HaskellBuildConfigurationWidget(HaskellBuildCon auto buildDirectoryInput = new Utils::PathChooser; buildDirectoryInput->setExpectedKind(Utils::PathChooser::Directory); - buildDirectoryInput->setFileName(m_buildConfiguration->buildDirectory()); + buildDirectoryInput->setFilePath(m_buildConfiguration->buildDirectory()); details->layout()->addWidget(buildDirectoryInput); connect(m_buildConfiguration, &BuildConfiguration::buildDirectoryChanged, buildDirectoryInput, [this, buildDirectoryInput] { - buildDirectoryInput->setFileName(m_buildConfiguration->buildDirectory()); + buildDirectoryInput->setFilePath(m_buildConfiguration->buildDirectory()); }); connect(buildDirectoryInput, &Utils::PathChooser::pathChanged, diff --git a/plugins/haskell/optionspage.cpp b/plugins/haskell/optionspage.cpp index cba0517..63d1594 100644 --- a/plugins/haskell/optionspage.cpp +++ b/plugins/haskell/optionspage.cpp @@ -62,7 +62,7 @@ QWidget *OptionsPage::widget() m_stackPath = new PathChooser(); m_stackPath->setExpectedKind(PathChooser::ExistingCommand); m_stackPath->setPromptDialogTitle(tr("Choose Stack Executable")); - m_stackPath->setFileName(HaskellManager::stackExecutable()); + m_stackPath->setFilePath(HaskellManager::stackExecutable()); m_stackPath->setCommandVersionArguments({"--version"}); boxLayout->addWidget(m_stackPath); } |