diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index 698dc48951a..855a594ff94 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -93,7 +93,6 @@ public:
     FilePath filePath() const; // Close to what's in the line edit.
     FilePath absoluteFilePath() const; // Relative paths resolved wrt the specified base dir.
 
-    QString rawPath() const; // The raw unexpanded input.
     FilePath rawFilePath() const; // The raw unexpanded input as FilePath.
 
     static QString expandedDirectory(const QString &input, const Environment &env,
@@ -158,7 +157,9 @@ public:
     // input value during validation if the real value is empty
     // setting an empty QString will disable this and clear the placeHolderText
     void setDefaultValue(const QString &defaultValue);
+
 private:
+    QString rawPath() const; // The raw unexpanded input.
     bool validatePath(FancyLineEdit *edit, QString *errorMessage) const;
     // Returns overridden title or the one from <title>
     QString makeDialogTitle(const QString &title);
diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp
index 11ff5b8d9cf..0c104ab367c 100644
--- a/src/plugins/clearcase/settingspage.cpp
+++ b/src/plugins/clearcase/settingspage.cpp
@@ -100,7 +100,7 @@ SettingsPageWidget::SettingsPageWidget()
 void SettingsPageWidget::apply()
 {
     ClearCaseSettings rc;
-    rc.ccCommand = m_ui.commandPathChooser->rawPath();
+    rc.ccCommand = m_ui.commandPathChooser->rawFilePath().toString();
     rc.ccBinaryPath = m_ui.commandPathChooser->filePath().toString();
     rc.timeOutS = m_ui.timeOutSpinBox->value();
     rc.autoCheckOut = m_ui.autoCheckOutCheckBox->isChecked();
diff --git a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
index c09a6cd0d56..f62d672adb1 100644
--- a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
+++ b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
@@ -114,7 +114,7 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
         ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index);
         if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) {
             auto edit = static_cast<Utils::PathChooser *>(editor);
-            if (edit->rawPath() != data.value)
+            if (edit->rawFilePath().toString() != data.value)
                 model->setData(index, edit->filePath().toString(), Qt::EditRole);
             return;
         } else if (!data.values.isEmpty()) {
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index b5985ac214a..853fc88b5e3 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -334,7 +334,7 @@ QString DebuggerSourcePathMappingWidget::editSourceField() const
 
 QString DebuggerSourcePathMappingWidget::editTargetField() const
 {
-    return m_targetChooser->rawPath();
+    return m_targetChooser->rawFilePath().toString();
 }
 
 void DebuggerSourcePathMappingWidget::setEditFieldMapping(const Mapping &m)
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 3350fb6fd8a..b930dbfe0cb 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -796,7 +796,7 @@ void QbsBuildStepConfigWidget::changeUseDefaultInstallDir(bool useDefault)
     if (useDefault)
         config.remove(Constants::QBS_INSTALL_ROOT_KEY);
     else
-        config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->rawPath());
+        config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->rawFilePath().toString());
     m_qbsStep->setQbsConfiguration(config);
     m_ignoreChange = false;
 }
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index c0049058abd..76ec7dbce3f 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -1011,7 +1011,7 @@ void QtOptionsPageWidget::linkWithQt()
 
     dialog.exec();
     if (dialog.result() == QDialog::Accepted) {
-        const Utils::optional<QString> settingsDir = settingsDirForQtDir(pathInput->rawPath());
+        const Utils::optional<QString> settingsDir = settingsDirForQtDir(pathInput->rawFilePath().toString());
         if (QTC_GUARD(settingsDir)) {
             QSettings(settingsFile(Core::ICore::resourcePath().toString()), QSettings::IniFormat)
                 .setValue(kInstallSettingsKey, *settingsDir);