diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index f269756ae3e..2d8e1b641d7 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1077,12 +1077,12 @@ void StringAspect::addToLayout(LayoutBuilder &builder) if (d->m_blockAutoApply) return; d->m_blockAutoApply = true; - setValue(d->m_pathChooserDisplay->path()); + setValue(d->m_pathChooserDisplay->filePath().toString()); d->m_blockAutoApply = false; }); } else { connect(d->m_pathChooserDisplay, &PathChooser::pathChanged, this, [this] { - setValue(d->m_pathChooserDisplay->path()); + setValue(d->m_pathChooserDisplay->filePath().toString()); }); } } @@ -1163,7 +1163,7 @@ QVariant StringAspect::volatileValue() const switch (d->m_displayStyle) { case PathChooserDisplay: QTC_ASSERT(d->m_pathChooserDisplay, return {}); - return d->m_pathChooserDisplay->path(); + return d->m_pathChooserDisplay->filePath().toString(); case LineEditDisplay: QTC_ASSERT(d->m_lineEditDisplay, return {}); return d->m_lineEditDisplay->text(); diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp index 0fac7ef6623..a8b808980dd 100644 --- a/src/plugins/clearcase/settingspage.cpp +++ b/src/plugins/clearcase/settingspage.cpp @@ -101,7 +101,7 @@ void SettingsPageWidget::apply() { ClearCaseSettings rc; rc.ccCommand = m_ui.commandPathChooser->rawPath(); - rc.ccBinaryPath = m_ui.commandPathChooser->path(); + rc.ccBinaryPath = m_ui.commandPathChooser->filePath().toString(); rc.timeOutS = m_ui.timeOutSpinBox->value(); rc.autoCheckOut = m_ui.autoCheckOutCheckBox->isChecked(); rc.noComment = m_ui.noCommentCheckBox->isChecked(); diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index 0f9d834472c..2b6c3ba2d0f 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -147,7 +147,7 @@ DesignerSettings SettingsPageWidget::settings() const settings.insert(DesignerSettingsKey::DEBUG_PUPPET, m_ui.debugPuppetComboBox->currentText()); - QString newFallbackPuppetPath = m_ui.fallbackPuppetPathLineEdit->path(); + QString newFallbackPuppetPath = m_ui.fallbackPuppetPathLineEdit->filePath().toString(); QTC_CHECK(PuppetCreator::defaultPuppetFallbackDirectory() == m_ui.fallbackPuppetPathLineEdit->lineEdit()->placeholderText()); if (newFallbackPuppetPath.isEmpty()) @@ -163,10 +163,10 @@ DesignerSettings SettingsPageWidget::settings() const settings.insert(DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY, QString()); } - if (!m_ui.puppetBuildPathLineEdit->path().isEmpty() && - m_ui.puppetBuildPathLineEdit->path() != PuppetCreator::defaultPuppetToplevelBuildDirectory()) { + if (!m_ui.puppetBuildPathLineEdit->filePath().isEmpty() && + m_ui.puppetBuildPathLineEdit->filePath().toString() != PuppetCreator::defaultPuppetToplevelBuildDirectory()) { settings.insert(DesignerSettingsKey::PUPPET_TOPLEVEL_BUILD_DIRECTORY, - m_ui.puppetBuildPathLineEdit->path()); + m_ui.puppetBuildPathLineEdit->filePath().toString()); } settings.insert(DesignerSettingsKey::ALWAYS_SAVE_IN_CRUMBLEBAR, m_ui.alwaysSaveSubcomponentsCheckBox->isChecked()); diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp index d70f7841c9e..7f972452710 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp @@ -168,7 +168,7 @@ QString ComponentNameDialog::isValid() const if (!ui->pathEdit->isValid()) return tr("Invalid path."); - if (QDir(ui->pathEdit->path()).exists(compName + ".qml")) + if (ui->pathEdit->filePath().pathAppended(compName + ".qml").exists()) return tr("Component already exists."); return QString();