From dfbb56746498f2c1f6125430e5ed47e9aaee5a97 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 6 Nov 2017 11:13:08 +0000 Subject: [PATCH] Update qprocessinfo to 39678d76bd9b462da9acbfea397dd56494aab73e --- qrenderdoc/Code/qprocessinfo.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/Code/qprocessinfo.cpp b/qrenderdoc/Code/qprocessinfo.cpp index 56d19dca8..c352dc912 100644 --- a/qrenderdoc/Code/qprocessinfo.cpp +++ b/qrenderdoc/Code/qprocessinfo.cpp @@ -120,6 +120,7 @@ QProcessList QProcessInfo::enumerate() #include #include #include +#include #include QProcessList QProcessInfo::enumerate() @@ -140,7 +141,7 @@ QProcessList QProcessInfo::enumerate() QProcessInfo info; info.setPid(pid); - QDir processDir(QStringLiteral("/proc") + f); + QDir processDir(QStringLiteral("/proc/") + f); // default to the exe symlink if valid QFileInfo exe(processDir.absoluteFilePath(QStringLiteral("exe"))); @@ -212,6 +213,15 @@ QProcessList QProcessInfo::enumerate() QList windowlist; + QString inPath = QStandardPaths::findExecutable(QStringLiteral("xdotool")); + + if(inPath.isEmpty()) + { + // add a fake window title to the first process to indicate that xdotool is missing + if(!ret.isEmpty()) + ret[0].setWindowTitle(QStringLiteral("Window titles not available - install `xdotool`")); + } + else { QProcess process; process.start(QStringLiteral("xdotool"), params);