diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 45d0ee0fddb..3914e1f5293 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -1087,7 +1087,7 @@ void StringAspect::addToLayout(LayoutBuilder &builder)
                 connect(d->m_pathChooserDisplay, &PathChooser::editingFinished, this, setPathChooserValue);
                 connect(d->m_pathChooserDisplay, &PathChooser::browsingFinished, this, setPathChooserValue);
             } else {
-                connect(d->m_pathChooserDisplay, &PathChooser::pathChanged,
+                connect(d->m_pathChooserDisplay, &PathChooser::textChanged,
                         this, [this](const QString &path) {
                     setValue(path);
                 });
diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp
index 27b49f7f391..40052c89d64 100644
--- a/src/libs/utils/filewizardpage.cpp
+++ b/src/libs/utils/filewizardpage.cpp
@@ -75,7 +75,7 @@ FileWizardPage::FileWizardPage(QWidget *parent) :
 
     setProperty(SHORT_TITLE_PROPERTY, tr("Location"));
 
-    registerFieldWithName(QLatin1String("Path"), d->m_pathChooser, "path", SIGNAL(pathChanged(QString)));
+    registerFieldWithName(QLatin1String("Path"), d->m_pathChooser, "path", SIGNAL(textChanged(QString)));
     registerFieldWithName(QLatin1String("FileName"), d->m_nameLineEdit);
 }
 
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 26d28c6adfc..a1bec96cd6b 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -246,11 +246,7 @@ PathChooser::PathChooser(QWidget *parent) :
             [this] { emit rawPathChanged(rawPath()); });
     connect(d->m_lineEdit, &FancyLineEdit::validChanged, this, &PathChooser::validChanged);
     connect(d->m_lineEdit, &QLineEdit::editingFinished, this, &PathChooser::editingFinished);
-    connect(d->m_lineEdit, &QLineEdit::textChanged, this, [this] {
-        const QString text = d->m_lineEdit->text();
-        emit pathChanged(text);
-        emit filePathChanged(FilePath::fromUserInput(text));
-    });
+    connect(d->m_lineEdit, &QLineEdit::textChanged, this, &PathChooser::textChanged);
 
     d->m_lineEdit->setMinimumWidth(120);
     d->m_hLayout->addWidget(d->m_lineEdit);
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index f93f06da11b..a46ed36bf8d 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -26,7 +26,7 @@ class PathChooserPrivate;
 class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget
 {
     Q_OBJECT
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged DESIGNABLE true)
+    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY textChanged DESIGNABLE true)
     Q_PROPERTY(QString promptDialogTitle READ promptDialogTitle WRITE setPromptDialogTitle DESIGNABLE true)
     Q_PROPERTY(QString promptDialogFilter READ promptDialogFilter WRITE setPromptDialogFilter DESIGNABLE true)
     Q_PROPERTY(Kind expectedKind READ expectedKind WRITE setExpectedKind DESIGNABLE true)
@@ -150,9 +150,8 @@ private:
 signals:
     void validChanged(bool validState);
     void rawPathChanged(const QString &text);
-    void pathChanged(const QString &path);
-    void filePathChanged(const FilePath &path);
-    void editingFinished();
+    void textChanged(const QString &text); // Triggered from the line edit's textChanged()
+    void editingFinished(); // Triggered from the line edit's editingFinished()
     void beforeBrowsing();
     void browsingFinished();
     void returnPressed();
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index 560e1b4aff0..7f4841476f7 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -118,7 +118,8 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
         d->m_stateLabel
     }.attachTo(this);
 
-    connect(d->m_pathChooser, &PathChooser::filePathChanged, this, &ProjectIntroPage::slotChanged);
+    connect(d->m_pathChooser, &PathChooser::textChanged,
+            this, &ProjectIntroPage::slotChanged);
     connect(d->m_nameLineEdit, &QLineEdit::textChanged,
             this, &ProjectIntroPage::slotChanged);
     connect(d->m_pathChooser, &PathChooser::validChanged,
@@ -131,7 +132,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
             this, &ProjectIntroPage::slotChanged);
 
     setProperty(SHORT_TITLE_PROPERTY, tr("Location"));
-    registerFieldWithName(QLatin1String("Path"), d->m_pathChooser, "path", SIGNAL(pathChanged(QString)));
+    registerFieldWithName(QLatin1String("Path"), d->m_pathChooser, "path", SIGNAL(textChanged(QString)));
     registerFieldWithName(QLatin1String("ProjectName"), d->m_nameLineEdit);
 }
 
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index cefdfa1986c..ea923ba1d05 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -208,7 +208,8 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup()
     keystoreLocationChooser->setInitialBrowsePathBackup(FileUtils::homePath());
     keystoreLocationChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)"));
     keystoreLocationChooser->setPromptDialogTitle(tr("Select Keystore File"));
-    connect(keystoreLocationChooser, &PathChooser::filePathChanged, this, [this](const FilePath &file) {
+    connect(keystoreLocationChooser, &PathChooser::textChanged, this, [this, keystoreLocationChooser] {
+        const FilePath file = keystoreLocationChooser->rawFilePath();
         m_step->setKeystorePath(file);
         m_signPackageCheckBox->setChecked(!file.isEmpty());
         if (!file.isEmpty())
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp
index 6feb6a6759a..caa57b73439 100644
--- a/src/plugins/android/createandroidmanifestwizard.cpp
+++ b/src/plugins/android/createandroidmanifestwizard.cpp
@@ -154,8 +154,9 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
     m_sourceDirectoryWarning->setWordWrap(true);
     m_layout->addRow(m_sourceDirectoryWarning);
 
-    connect(m_androidPackageSourceDir, &PathChooser::filePathChanged,
-            m_wizard, &CreateAndroidManifestWizard::setDirectory);
+    connect(m_androidPackageSourceDir, &PathChooser::textChanged, m_wizard, [this] {
+        m_wizard->setDirectory(m_androidPackageSourceDir->rawFilePath());
+    });
 
     if (wizard->copyGradle()) {
         auto checkBox = new QCheckBox(this);
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
index 44cc25939b7..b098aecbc1b 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
@@ -219,7 +219,7 @@ GdbServerProviderConfigWidget::GdbServerProviderConfigWidget(
 
     connect(m_startupModeComboBox, &QComboBox::currentIndexChanged,
             this, &GdbServerProviderConfigWidget::dirty);
-    connect(m_peripheralDescriptionFileChooser, &PathChooser::filePathChanged,
+    connect(m_peripheralDescriptionFileChooser, &PathChooser::textChanged,
             this, &GdbServerProviderConfigWidget::dirty);
 }
 
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index 6526d5245a2..c3630807725 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -277,7 +277,7 @@ UvscServerProviderConfigWidget::UvscServerProviderConfigWidget(UvscServerProvide
 
     connect(m_hostWidget, &HostWidget::dataChanged,
             this, &UvscServerProviderConfigWidget::dirty);
-    connect(m_toolsIniChooser, &PathChooser::filePathChanged,
+    connect(m_toolsIniChooser, &PathChooser::textChanged,
             this, &UvscServerProviderConfigWidget::dirty);
     connect(m_deviceSelector, &DeviceSelector::selectionChanged,
             this, &UvscServerProviderConfigWidget::dirty);
@@ -290,7 +290,7 @@ UvscServerProviderConfigWidget::UvscServerProviderConfigWidget(UvscServerProvide
         m_driverSelector->setToolsIniFile(toolsIniFile);
     };
 
-    connect(m_toolsIniChooser, &PathChooser::filePathChanged, this, updateSelectors);
+    connect(m_toolsIniChooser, &PathChooser::textChanged, this, updateSelectors);
     updateSelectors();
 }
 
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp
index 727dc5a8df0..93f4f2a72fc 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp
@@ -83,7 +83,7 @@ DeviceSelectorDetailsPanel::DeviceSelectorDetailsPanel(DeviceSelection &selectio
             m_selection.algorithmIndex = index;
         emit selectionChanged();
     });
-    connect(m_peripheralDescriptionFileChooser, &Utils::PathChooser::filePathChanged,
+    connect(m_peripheralDescriptionFileChooser, &Utils::PathChooser::textChanged,
             this, &DeviceSelectorDetailsPanel::selectionChanged);
 }
 
diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp
index 3c04930edfd..a0aeb387999 100644
--- a/src/plugins/coreplugin/plugininstallwizard.cpp
+++ b/src/plugins/coreplugin/plugininstallwizard.cpp
@@ -89,11 +89,11 @@ public:
         label->setWordWrap(true);
         vlayout->addWidget(label);
 
-        auto path = new PathChooser;
-        path->setExpectedKind(PathChooser::Any);
-        vlayout->addWidget(path);
-        connect(path, &PathChooser::pathChanged, this, [this, path] {
-            m_data->sourcePath = path->filePath();
+        auto chooser = new PathChooser;
+        chooser->setExpectedKind(PathChooser::Any);
+        vlayout->addWidget(chooser);
+        connect(chooser, &PathChooser::textChanged, this, [this, chooser] {
+            m_data->sourcePath = chooser->filePath();
             updateWarnings();
         });
 
diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
index 2e3927af5d1..cd7718cef6b 100644
--- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
@@ -372,7 +372,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
             return;
         }
     };
-    connect(&d->clangdChooser, &Utils::PathChooser::filePathChanged, this, updateWarningLabel);
+    connect(&d->clangdChooser, &Utils::PathChooser::textChanged, this, updateWarningLabel);
     updateWarningLabel();
 
     connect(&d->useClangdCheckBox, &QCheckBox::toggled,
@@ -389,7 +389,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
             this, &ClangdSettingsWidget::settingsDataChanged);
     connect(&d->documentUpdateThreshold, &QSpinBox::valueChanged,
             this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&d->clangdChooser, &Utils::PathChooser::filePathChanged,
+    connect(&d->clangdChooser, &Utils::PathChooser::textChanged,
             this, &ClangdSettingsWidget::settingsDataChanged);
     connect(d->configSelectionWidget, &ClangDiagnosticConfigsSelectionWidget::changed,
             this, &ClangdSettingsWidget::settingsDataChanged);
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index b8892409e99..e7d3ec25b32 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -324,9 +324,9 @@ DebuggerItemConfigWidget::DebuggerItemConfigWidget()
     formLayout->addRow(new QLabel(Tr::tr("Version:")), m_versionLabel);
     formLayout->addRow(new QLabel(Tr::tr("Working directory:")), m_workingDirectoryChooser);
 
-    connect(m_binaryChooser, &PathChooser::filePathChanged,
+    connect(m_binaryChooser, &PathChooser::textChanged,
             this, &DebuggerItemConfigWidget::binaryPathHasChanged);
-    connect(m_workingDirectoryChooser, &PathChooser::filePathChanged,
+    connect(m_workingDirectoryChooser, &PathChooser::textChanged,
             this, &DebuggerItemConfigWidget::store);
     connect(m_displayNameLineEdit, &QLineEdit::textChanged,
             this, &DebuggerItemConfigWidget::store);
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index 429fc55282c..d924c8cf7d1 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -272,7 +272,7 @@ DebuggerSourcePathMappingWidget::DebuggerSourcePathMappingWidget() :
     m_targetChooser->setHistoryCompleter("Debugger.MappingTarget.History");
     connect(m_sourceLineEdit, &QLineEdit::textChanged,
             this, &DebuggerSourcePathMappingWidget::slotEditSourceFieldChanged);
-    connect(m_targetChooser, &PathChooser::filePathChanged,
+    connect(m_targetChooser, &PathChooser::textChanged,
             this, &DebuggerSourcePathMappingWidget::slotEditTargetFieldChanged);
     auto editLayout = new QFormLayout;
     const QString sourceToolTip = Tr::tr("<p>The source path contained in the "
diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp
index 01515197bb8..469cf8693f2 100644
--- a/src/plugins/debugger/loadcoredialog.cpp
+++ b/src/plugins/debugger/loadcoredialog.cpp
@@ -276,9 +276,13 @@ AttachCoreDialog::~AttachCoreDialog()
 int AttachCoreDialog::exec()
 {
     connect(d->selectRemoteCoreButton, &QAbstractButton::clicked, this, &AttachCoreDialog::selectRemoteCoreFile);
-    connect(d->remoteCoreFileName, &PathChooser::filePathChanged, this, &AttachCoreDialog::coreFileChanged);
-    connect(d->symbolFileName, &PathChooser::filePathChanged, this, &AttachCoreDialog::changed);
-    connect(d->localCoreFileName, &PathChooser::filePathChanged, this, &AttachCoreDialog::coreFileChanged);
+    connect(d->remoteCoreFileName, &PathChooser::textChanged, this, [this] {
+        coreFileChanged(d->remoteCoreFileName->rawFilePath());
+    });
+    connect(d->symbolFileName, &PathChooser::textChanged, this, &AttachCoreDialog::changed);
+    connect(d->localCoreFileName, &PathChooser::textChanged, this, [this] {
+        coreFileChanged(d->localCoreFileName->rawFilePath());
+    });
     connect(d->forceLocalCheckBox, &QCheckBox::stateChanged, this, &AttachCoreDialog::changed);
     connect(d->kitChooser, &KitChooser::currentIndexChanged, this, &AttachCoreDialog::changed);
     connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp
index b1c95e9505a..3aa7fbea5b4 100644
--- a/src/plugins/debugger/unstartedappwatcherdialog.cpp
+++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp
@@ -145,7 +145,7 @@ UnstartedAppWatcherDialog::UnstartedAppWatcherDialog(QWidget *parent)
             this, &UnstartedAppWatcherDialog::selectExecutable);
     connect(m_watchingPushButton, &QAbstractButton::toggled,
             this, &UnstartedAppWatcherDialog::startStopWatching);
-    connect(m_pathChooser, &Utils::PathChooser::filePathChanged,
+    connect(m_pathChooser, &Utils::PathChooser::textChanged,
             this, &UnstartedAppWatcherDialog::stopAndCheckExecutable);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
     connect(&m_timer, &QTimer::timeout,
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index a65babe683b..9d274942d25 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -83,9 +83,9 @@ ChangeSelectionDialog::ChangeSelectionDialog(const FilePath &workingDirectory, I
 
     connect(m_changeNumberEdit, &CompletingLineEdit::textChanged,
             this, &ChangeSelectionDialog::changeTextChanged);
-    connect(m_workingDirectoryChooser, &PathChooser::filePathChanged,
+    connect(m_workingDirectoryChooser, &PathChooser::textChanged,
             this, &ChangeSelectionDialog::recalculateDetails);
-    connect(m_workingDirectoryChooser, &PathChooser::filePathChanged,
+    connect(m_workingDirectoryChooser, &PathChooser::textChanged,
             this, &ChangeSelectionDialog::recalculateCompletion);
     connect(selectFromHistoryButton, &QPushButton::clicked,
             this, &ChangeSelectionDialog::selectCommitFromRecentHistory);
diff --git a/src/plugins/gitlab/gitlabclonedialog.cpp b/src/plugins/gitlab/gitlabclonedialog.cpp
index 95076670009..1ac219e4371 100644
--- a/src/plugins/gitlab/gitlabclonedialog.cpp
+++ b/src/plugins/gitlab/gitlabclonedialog.cpp
@@ -91,7 +91,7 @@ GitLabCloneDialog::GitLabCloneDialog(const Project &project, QWidget *parent)
     QTC_ASSERT(slashIndex > 0, return);
     m_directoryLE->setText(path.mid(slashIndex + 1));
 
-    connect(m_pathChooser, &Utils::PathChooser::filePathChanged, this, [this]() {
+    connect(m_pathChooser, &Utils::PathChooser::textChanged, this, [this] {
         m_directoryLE->validate();
         GitLabCloneDialog::updateUi();
     });
diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp
index 2f299b48b4e..d2a843dee98 100644
--- a/src/plugins/mcusupport/mcupackage.cpp
+++ b/src/plugins/mcusupport/mcupackage.cpp
@@ -260,7 +260,7 @@ QWidget *McuPackage::widget()
 
     QObject::connect(this, &McuPackage::statusChanged, this, [this] { updateStatusUi(); });
 
-    QObject::connect(m_fileChooser, &PathChooser::filePathChanged, this, [this] {
+    QObject::connect(m_fileChooser, &PathChooser::textChanged, this, [this] {
         updatePath();
         emit changed();
     });
diff --git a/src/plugins/modeleditor/extpropertiesmview.cpp b/src/plugins/modeleditor/extpropertiesmview.cpp
index 9eda2651a20..6709f86a058 100644
--- a/src/plugins/modeleditor/extpropertiesmview.cpp
+++ b/src/plugins/modeleditor/extpropertiesmview.cpp
@@ -45,7 +45,7 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
             m_configPath->setInitialBrowsePathBackup(
                 Utils::FilePath::fromString(project->fileName()).absolutePath());
             addRow(tr("Config path:"), m_configPath, "configpath");
-            connect(m_configPath, &Utils::PathChooser::filePathChanged,
+            connect(m_configPath, &Utils::PathChooser::textChanged,
                     this, &ExtPropertiesMView::onConfigPathChanged);
         }
         if (!m_configPath->hasFocus()) {
@@ -64,8 +64,9 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
     }
 }
 
-void ExtPropertiesMView::onConfigPathChanged(const Utils::FilePath &path)
+void ExtPropertiesMView::onConfigPathChanged()
 {
+    const Utils::FilePath path = m_configPath->rawFilePath();
     bool modified = false;
     qmt::Project *project = m_projectController->project();
     if (path.isEmpty()) {
diff --git a/src/plugins/modeleditor/extpropertiesmview.h b/src/plugins/modeleditor/extpropertiesmview.h
index 02659aa6c27..46400ff95b8 100644
--- a/src/plugins/modeleditor/extpropertiesmview.h
+++ b/src/plugins/modeleditor/extpropertiesmview.h
@@ -7,10 +7,7 @@
 
 namespace qmt { class ProjectController; }
 
-namespace Utils {
-class FilePath;
-class PathChooser;
-} // Utils
+namespace Utils { class PathChooser; }
 
 namespace ModelEditor {
 namespace Internal {
@@ -28,7 +25,7 @@ public:
     void visitMPackage(const qmt::MPackage *package) override;
 
 private:
-    void onConfigPathChanged(const Utils::FilePath &path);
+    void onConfigPathChanged();
 
 private:
     qmt::ProjectController *m_projectController = nullptr;
diff --git a/src/plugins/nim/project/nimtoolchainfactory.cpp b/src/plugins/nim/project/nimtoolchainfactory.cpp
index 142888667e5..e3e9feb9e1e 100644
--- a/src/plugins/nim/project/nimtoolchainfactory.cpp
+++ b/src/plugins/nim/project/nimtoolchainfactory.cpp
@@ -10,8 +10,9 @@
 
 #include <utils/algorithm.h>
 #include <utils/environment.h>
-#include <utils/pathchooser.h>
 #include <utils/fileutils.h>
+#include <utils/pathchooser.h>
+#include <utils/qtcassert.h>
 
 #include <QFormLayout>
 
@@ -84,7 +85,13 @@ NimToolChainConfigWidget::NimToolChainConfigWidget(NimToolChain *tc)
     fillUI();
 
     // Connect
-    connect(m_compilerCommand, &PathChooser::pathChanged, this, &NimToolChainConfigWidget::onCompilerCommandChanged);
+    connect(m_compilerCommand, &PathChooser::textChanged, this, [this] {
+        const FilePath path = m_compilerCommand->rawFilePath();
+        auto tc = static_cast<NimToolChain *>(toolChain());
+        QTC_ASSERT(tc, return);
+        tc->setCompilerCommand(path);
+        fillUI();
+    });
 }
 
 void NimToolChainConfigWidget::applyImpl()
@@ -121,12 +128,4 @@ void NimToolChainConfigWidget::fillUI()
     m_compilerVersion->setText(tc->compilerVersion());
 }
 
-void NimToolChainConfigWidget::onCompilerCommandChanged(const QString &path)
-{
-    auto tc = static_cast<NimToolChain *>(toolChain());
-    Q_ASSERT(tc);
-    tc->setCompilerCommand(FilePath::fromString(path));
-    fillUI();
-}
-
 }
diff --git a/src/plugins/nim/project/nimtoolchainfactory.h b/src/plugins/nim/project/nimtoolchainfactory.h
index 7ee9f780a7e..9d517d8f662 100644
--- a/src/plugins/nim/project/nimtoolchainfactory.h
+++ b/src/plugins/nim/project/nimtoolchainfactory.h
@@ -36,10 +36,9 @@ protected:
 
 private:
     void fillUI();
-    void onCompilerCommandChanged(const QString &path);
 
     Utils::PathChooser *m_compilerCommand;
     QLineEdit *m_compilerVersion;
 };
 
-}
+} // Nim
diff --git a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp
index a6b30eddc76..0b6e1001419 100644
--- a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp
@@ -135,7 +135,7 @@ void SshSettingsWidget::setupPathChooser(PathChooser &chooser, const FilePath &i
 {
     chooser.setExpectedKind(PathChooser::ExistingCommand);
     chooser.setFilePath(initialPath);
-    connect(&chooser, &PathChooser::filePathChanged, [&changedFlag] { changedFlag = true; });
+    connect(&chooser, &PathChooser::textChanged, [&changedFlag] { changedFlag = true; });
 }
 
 void SshSettingsWidget::updateCheckboxEnabled()
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
index 29da1acf35f..67b8da4ce56 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
@@ -834,7 +834,7 @@ QWidget *PathChooserField::createWidget(const QString &displayName, JsonFieldPag
     auto w = new PathChooser;
     if (!m_historyId.isEmpty())
         w->setHistoryCompleter(m_historyId);
-    QObject::connect(w, &PathChooser::filePathChanged, [this, w] {
+    QObject::connect(w, &PathChooser::textChanged, [this, w] {
         if (w->filePath() != m_path)
             setHasUserChanges();
     });
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 66e13bb4f59..b5b9f47bc8d 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -58,7 +58,7 @@ public:
         m_chooser->setExpectedKind(PathChooser::ExistingDirectory);
         m_chooser->setHistoryCompleter(QLatin1String("PE.SysRoot.History"));
         m_chooser->setFilePath(SysRootKitAspect::sysRoot(k));
-        connect(m_chooser, &PathChooser::filePathChanged,
+        connect(m_chooser, &PathChooser::textChanged,
                 this, &SysRootKitAspectWidget::pathWasChanged);
     }
 
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 16bd230664e..ea701ae498f 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -172,7 +172,7 @@ void WorkingDirectoryAspect::addToLayout(LayoutBuilder &builder)
     m_chooser->setPromptDialogTitle(tr("Select Working Directory"));
     m_chooser->setBaseDirectory(m_defaultWorkingDirectory);
     m_chooser->setFilePath(m_workingDirectory.isEmpty() ? m_defaultWorkingDirectory : m_workingDirectory);
-    connect(m_chooser.data(), &PathChooser::filePathChanged, this, [this] {
+    connect(m_chooser.data(), &PathChooser::textChanged, this, [this] {
         m_workingDirectory = m_chooser->rawFilePath();
         m_resetButton->setEnabled(m_workingDirectory != m_defaultWorkingDirectory);
     });
diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp
index 5179a8c0ef2..5226e40548c 100644
--- a/src/plugins/python/pythonsettings.cpp
+++ b/src/plugins/python/pythonsettings.cpp
@@ -87,7 +87,7 @@ public:
         m_executable->setExpectedKind(PathChooser::ExistingCommand);
 
         connect(m_name, &QLineEdit::textChanged, this, &InterpreterDetailsWidget::changed);
-        connect(m_executable, &PathChooser::filePathChanged, this, &InterpreterDetailsWidget::changed);
+        connect(m_executable, &PathChooser::textChanged, this, &InterpreterDetailsWidget::changed);
 
         Form {
             Tr::tr("Name:"), m_name, br,
diff --git a/src/plugins/qbsprojectmanager/qbssettings.cpp b/src/plugins/qbsprojectmanager/qbssettings.cpp
index 2d26aca56fd..ec19a3b7142 100644
--- a/src/plugins/qbsprojectmanager/qbssettings.cpp
+++ b/src/plugins/qbsprojectmanager/qbssettings.cpp
@@ -161,7 +161,7 @@ public:
         layout->addRow(tr("Default installation directory:"), &m_defaultInstallDirLineEdit);
         layout->addRow(tr("Qbs version:"), &m_versionLabel);
 
-        connect(&m_qbsExePathChooser, &PathChooser::filePathChanged, [this] {
+        connect(&m_qbsExePathChooser, &PathChooser::textChanged, [this] {
             m_versionLabel.setText(getQbsVersionString());
         });
     }
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
index f90ff482d5b..885ab406b47 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
@@ -94,12 +94,10 @@ void CmakeProjectConverterDialog::pathValidChanged()
 {
     bool valid = isValid();
 
-    if (valid) {
-        m_newProjectDir = FilePath::fromString(m_dirSelector->path()).pathAppended(m_nameEditor->text());
-    }
-    else {
+    if (valid)
+        m_newProjectDir = m_dirSelector->filePath().pathAppended(m_nameEditor->text());
+    else
         m_newProjectDir = FilePath();
-    }
 
     const QString error = errorText();
     m_errorLabel->setType(error.isEmpty() ? InfoLabel::None : InfoLabel::Warning);
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
index ff2567647d6..247a78f0a77 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
@@ -196,7 +196,7 @@ GenericLinuxDeviceConfigurationWizardKeyDeploymentPage::GenericLinuxDeviceConfig
     deployLayout->addWidget(&d->iconLabel);
     deployLayout->addStretch();
     mainLayout->addLayout(deployLayout);
-    connect(&d->keyFileChooser, &PathChooser::filePathChanged, this, [this, deployButton] {
+    connect(&d->keyFileChooser, &PathChooser::textChanged, this, [this, deployButton] {
         deployButton->setEnabled(d->keyFileChooser.filePath().exists());
         d->iconLabel.clear();
         emit completeChanged();
diff --git a/src/plugins/squish/opensquishsuitesdialog.cpp b/src/plugins/squish/opensquishsuitesdialog.cpp
index b62ae120ae0..74045fad4d1 100644
--- a/src/plugins/squish/opensquishsuitesdialog.cpp
+++ b/src/plugins/squish/opensquishsuitesdialog.cpp
@@ -59,7 +59,7 @@ OpenSquishSuitesDialog::OpenSquishSuitesDialog(QWidget *parent)
     }.attachTo(this);
 
     connect(m_directoryLineEdit,
-            &Utils::PathChooser::pathChanged,
+            &Utils::PathChooser::textChanged,
             this,
             &OpenSquishSuitesDialog::onDirectoryChanged);
     connect(selectAllPushButton,
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 48a0d1ccd7f..450d442f01c 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -149,8 +149,8 @@ QWidget *FindInFiles::createConfigWidget()
         m_directory = new PathChooser;
         m_directory->setExpectedKind(PathChooser::ExistingDirectory);
         m_directory->setPromptDialogTitle(tr("Directory to Search"));
-        connect(m_directory.data(), &PathChooser::filePathChanged,
-                this, &FindInFiles::pathChanged);
+        connect(m_directory.data(), &PathChooser::textChanged, this,
+                [this] { pathChanged(m_directory->rawFilePath()); });
         m_directory->setHistoryCompleter(QLatin1String(HistoryKey),
                                          /*restoreLastItemFromHistory=*/ true);
         if (!HistoryCompleter::historyExistsFor(QLatin1String(HistoryKey))) {
diff --git a/src/plugins/webassembly/webassemblyoptionspage.cpp b/src/plugins/webassembly/webassemblyoptionspage.cpp
index 7f4761d1d5e..46b08628661 100644
--- a/src/plugins/webassembly/webassemblyoptionspage.cpp
+++ b/src/plugins/webassembly/webassemblyoptionspage.cpp
@@ -67,7 +67,7 @@ WebAssemblyOptionsWidget::WebAssemblyOptionsWidget()
         m_emSdkPathChooser->setExpectedKind(PathChooser::Directory);
         m_emSdkPathChooser->setInitialBrowsePathBackup(FileUtils::homePath());
         m_emSdkPathChooser->setFilePath(WebAssemblyEmSdk::registeredEmSdk());
-        connect(m_emSdkPathChooser, &PathChooser::filePathChanged,
+        connect(m_emSdkPathChooser, &PathChooser::textChanged,
                 this, &WebAssemblyOptionsWidget::updateStatus);
         layout->addWidget(m_emSdkPathChooser);
         m_emSdkVersionDisplay = new InfoLabel(this);