diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index 0b56b822707..cf323934078 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -131,6 +131,7 @@ public: bool operator>(const FilePath &other) const; bool operator>=(const FilePath &other) const; FilePath operator+(const QString &s) const; + FilePath operator/(const QString &str) const; bool isChildOf(const FilePath &s) const; bool isChildOf(const QDir &dir) const; @@ -163,8 +164,6 @@ public: FilePath resolveSymlinks() const; FilePath withExecutableSuffix() const; - FilePath operator/(const QString &str) const; - void clear(); bool isEmpty() const; diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index 95ea1313d19..750bccbb448 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -88,17 +89,20 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const FilePath &pathIn) if (!pathIn.isDir()) param += QLatin1String("/select,"); param += QDir::toNativeSeparators(fileInfo.canonicalFilePath()); - QProcess::startDetached(explorer.toString(), param); + QtcProcess::startDetached({explorer, param}); } else if (HostOsInfo::isMacHost()) { QStringList scriptArgs; scriptArgs << QLatin1String("-e") << QString::fromLatin1("tell application \"Finder\" to reveal POSIX file \"%1\"") .arg(fileInfo.canonicalFilePath()); - QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs); + QtcProcess osascriptProcess; + osascriptProcess.setCommand({"/usr/bin/osascript", scriptArgs}); + osascriptProcess.runBlocking(); scriptArgs.clear(); scriptArgs << QLatin1String("-e") << QLatin1String("tell application \"Finder\" to activate"); - QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs); + osascriptProcess.setCommand({"/usr/bin/osascript", scriptArgs}); + osascriptProcess.runBlocking(); } else { // we cannot select a file here, because no file browser really supports it... const QString folder = fileInfo.isDir() ? fileInfo.absoluteFilePath() : fileInfo.filePath(); diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index c6872dcda8b..4137848c582 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -383,7 +383,7 @@ QDate UpdateInfoPlugin::nextCheckDate(CheckUpdateInterval interval) const void UpdateInfoPlugin::startUpdater() { - QProcess::startDetached(d->m_maintenanceTool, QStringList(QLatin1String("--updater"))); + Utils::QtcProcess::startDetached({Utils::FilePath::fromString(d->m_maintenanceTool), {"--updater"}}); } } //namespace Internal