From 5ccd4f2db8ebcfb0e8548524763999f0dc115271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 10 Jan 2013 09:55:52 +0100 Subject: [PATCH] Adding version information to supportInformation * KWin version as defined by KDE4WORKSPACE_VERSION * KDE SC version (compile) * KDE SC version (runtime) * Qt version (runtime) REVIEW: 108320 --- config-kwin.h.cmake | 1 + workspace.cpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake index e33548846d..3dbd146bb0 100644 --- a/config-kwin.h.cmake +++ b/config-kwin.h.cmake @@ -8,3 +8,4 @@ #cmakedefine KWIN_BUILD_OXYGEN 1 #define KWIN_NAME "${KWIN_NAME}" #define KWIN_CONFIG "${KWIN_NAME}rc" +#define KWIN_VERSION_STRING "${KDE4WORKSPACE_VERSION}" diff --git a/workspace.cpp b/workspace.cpp index 366043168b..c42f420a8d 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -42,6 +42,7 @@ along with this program. If not, see . #include #include #include +#include #include #include "client.h" @@ -2171,6 +2172,20 @@ QString Workspace::supportInformation() const // all following strings are intended for support. They need to be pasted to e.g forums.kde.org // it is expected that the support will happen in English language or that the people providing // help understand English. Because of that all texts are not translated + support.append("Version\n"); + support.append("=======\n"); + support.append("KWin version: "); + support.append(KWIN_VERSION_STRING); + support.append('\n'); + support.append("KDE SC version (runtime): "); + support.append(KDE::versionString()); + support.append('\n'); + support.append("KDE SC version (compile): "); + support.append(KDE_VERSION_STRING); + support.append('\n'); + support.append("Qt Version: "); + support.append(qVersion()); + support.append("\n\n"); support.append("Options\n"); support.append("=======\n"); const QMetaObject *metaOptions = options->metaObject();