From 6bb339ff9044bf380c1c26e5765e8a091ba6dfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 2 Feb 2015 09:28:14 +0100 Subject: [PATCH] Add Qt and XCB compile version to supportInformation Add QT_VERSION_STR in addition to qVersion(). This could be useful to see whether the runtime version is different to the Qt version used at compile time. Also adds the XCB_VERSION_STRING which is used at compile time. This is useful as for example XCB::SYNC was broken prior to 1.10. REVIEW: 122375 --- config-kwin.h.cmake | 1 + workspace.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake index cdd935e609..98cf1da568 100644 --- a/config-kwin.h.cmake +++ b/config-kwin.h.cmake @@ -7,6 +7,7 @@ #define KWIN_INTERNAL_NAME_X11 "${KWIN_INTERNAL_NAME_X11}" #define KWIN_CONFIG "${KWIN_NAME}rc" #define KWIN_VERSION_STRING "${PROJECT_VERSION}" +#define XCB_VERSION_STRING "${XCB_VERSION}" #define KWIN_KILLER_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kwin_killer_helper" #cmakedefine01 HAVE_WAYLAND #cmakedefine01 HAVE_WAYLAND_EGL diff --git a/workspace.cpp b/workspace.cpp index 83b7ad036e..7cbe81ebac 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -1331,7 +1331,9 @@ QString Workspace::supportInformation() const support.append(QStringLiteral("\n")); support.append(QStringLiteral("Qt Version: ")); support.append(QString::fromUtf8(qVersion())); - support.append(QStringLiteral("\n\n")); + support.append(QStringLiteral("\n")); + support.append(QStringLiteral("Qt compile version: %1\n").arg(QStringLiteral(QT_VERSION_STR))); + support.append(QStringLiteral("XCB compile version: %1\n\n").arg(QStringLiteral(XCB_VERSION_STRING))); support.append(QStringLiteral("Operation Mode: ")); switch (kwinApp()->operationMode()) { case Application::OperationModeX11: