feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Use FilePath for Link with Qt feature

Browse Source 
Change-Id: Ic153523494e9b253850e74136db5027d4db55c53
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
This commit is contained in:
hjk
2021-09-27 13:07:56 +02:00
parent 8b7f9bacb2
commit 8cdbb31aaf
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -799,7 +799,7 @@ static QString qtVersionsFile(const QString &baseDir)
+ Core::Constants::IDE_ID + '/' + "qtversion.xml"; + Core::Constants::IDE_ID + '/' + "qtversion.xml";
} }
static Utils::optional<QString> currentlyLinkedQtDir(bool *hasInstallSettings) static Utils::optional<FilePath> currentlyLinkedQtDir(bool *hasInstallSettings)
{ {
const QString installSettingsFilePath = settingsFile(Core::ICore::resourcePath().toString()); const QString installSettingsFilePath = settingsFile(Core::ICore::resourcePath().toString());
const bool installSettingsExist = QFile::exists(installSettingsFilePath); const bool installSettingsExist = QFile::exists(installSettingsFilePath);
@@ -809,7 +809,7 @@ static Utils::optional<QString> currentlyLinkedQtDir(bool *hasInstallSettings)
const QVariant value = QSettings(installSettingsFilePath, QSettings::IniFormat) const QVariant value = QSettings(installSettingsFilePath, QSettings::IniFormat)
.value(kInstallSettingsKey); .value(kInstallSettingsKey);
if (value.isValid()) if (value.isValid())
return value.toString(); return FilePath::fromVariant(value);
} }
return {}; return {};
} }
@@ -826,7 +826,7 @@ static bool canLinkWithQt(QString *toolTip)
{ {
bool canLink = true; bool canLink = true;
bool installSettingsExist; bool installSettingsExist;
const Utils::optional<QString> installSettingsValue = currentlyLinkedQtDir( const Utils::optional<FilePath> installSettingsValue = currentlyLinkedQtDir(
&installSettingsExist); &installSettingsExist);
QStringList tip; QStringList tip;
tip << linkingPurposeText(); tip << linkingPurposeText();
@@ -843,10 +843,10 @@ static bool canLinkWithQt(QString *toolTip)
tip << QtOptionsPageWidget::tr("%1 is part of a Qt installation.") tip << QtOptionsPageWidget::tr("%1 is part of a Qt installation.")
.arg(Core::Constants::IDE_DISPLAY_NAME); .arg(Core::Constants::IDE_DISPLAY_NAME);
} }
const QString link = installSettingsValue ? *installSettingsValue : QString(); const FilePath link = installSettingsValue ? *installSettingsValue : FilePath();
if (!link.isEmpty()) if (!link.isEmpty())
tip << QtOptionsPageWidget::tr("%1 is currently linked to \"%2\".") tip << QtOptionsPageWidget::tr("%1 is currently linked to \"%2\".")
.arg(QString(Core::Constants::IDE_DISPLAY_NAME), QDir::toNativeSeparators(link)); .arg(QString(Core::Constants::IDE_DISPLAY_NAME), link.toUserOutput());
if (toolTip) if (toolTip)
*toolTip = tip.join("\n\n"); *toolTip = tip.join("\n\n");
return canLink; return canLink;
@@ -943,11 +943,11 @@ static bool validateQtInstallDir(FancyLineEdit *input, QString *errorString)
return true; return true;
} }
static QString defaultQtInstallationPath() static FilePath defaultQtInstallationPath()
{ {
if (HostOsInfo::isWindowsHost()) if (HostOsInfo::isWindowsHost())
return {"C:/Qt"}; return FilePath::fromString({"C:/Qt"});
return QDir::homePath() + "/Qt"; return FileUtils::homePath() / "Qt";
} }
void QtOptionsPageWidget::linkWithQt() void QtOptionsPageWidget::linkWithQt()
@@ -980,8 +980,8 @@ void QtOptionsPageWidget::linkWithQt()
return false; return false;
return validateQtInstallDir(input, errorString); return validateQtInstallDir(input, errorString);
}); });
const Utils::optional<QString> currentLink = currentlyLinkedQtDir(nullptr); const Utils::optional<FilePath> currentLink = currentlyLinkedQtDir(nullptr);
pathInput->setPath(currentLink ? *currentLink : defaultQtInstallationPath()); pathInput->setFilePath(currentLink ? *currentLink : defaultQtInstallationPath());
auto buttons = new QDialogButtonBox; auto buttons = new QDialogButtonBox;
layout->addStretch(10); layout->addStretch(10);
layout->addWidget(buttons); layout->addWidget(buttons);