diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.h b/qrenderdoc/Code/pyrenderdoc/PythonContext.h index a5c979914..4617756f1 100644 --- a/qrenderdoc/Code/pyrenderdoc/PythonContext.h +++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.h @@ -88,7 +88,7 @@ public: bool CheckInterfaces(rdcstr &log); - QString versionString(); + static QString versionString(); template void setGlobal(const char *varName, T *object) diff --git a/qrenderdoc/Windows/Dialogs/AboutDialog.cpp b/qrenderdoc/Windows/Dialogs/AboutDialog.cpp index 180ef7d98..a0bd21d90 100644 --- a/qrenderdoc/Windows/Dialogs/AboutDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/AboutDialog.cpp @@ -27,6 +27,7 @@ #include #include #include "Code/QRDUtils.h" +#include "Code/pyrenderdoc/PythonContext.h" #include "ui_AboutDialog.h" #include "version.h" @@ -48,7 +49,10 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia .arg(hash.left(8))); } - ui->version->setText(tr("%1 (Qt version %2)").arg(ui->version->text()).arg(lit(QT_VERSION_STR))); + ui->version->setText(tr("%1 (Qt %2) (Python %3)") + .arg(ui->version->text()) + .arg(lit(QT_VERSION_STR)) + .arg(PythonContext::versionString())); #if defined(DISTRIBUTION_VERSION) ui->owner->setText(QFormatStr("Baldur Karlsson - Packaged for %1").arg(lit(DISTRIBUTION_NAME))); diff --git a/qrenderdoc/Windows/PythonShell.cpp b/qrenderdoc/Windows/PythonShell.cpp index 876cf420f..d5d0a54ae 100644 --- a/qrenderdoc/Windows/PythonShell.cpp +++ b/qrenderdoc/Windows/PythonShell.cpp @@ -2398,7 +2398,7 @@ QString PythonShell::scriptHeader() The 'pyrenderdoc' object is the current CaptureContext instance. The 'renderdoc' and 'qrenderdoc' modules are available. Documentation is available: https://renderdoc.org/docs/python_api/index.html)") - .arg(interactiveContext->versionString()); + .arg(PythonContext::versionString()); } void PythonShell::appendText(QTextEdit *output, const QString &text)