From 03a330a4dd49e89ad33415a9de30ae03c34156b1 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Wed, 22 Jul 2015 20:27:39 +0200 Subject: [PATCH] Port Tools::platform() to Qt 5. The Q_WS_* definitions are gone. --- src/core/Tools.cpp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp index 8034417f..f6f46852 100644 --- a/src/core/Tools.cpp +++ b/src/core/Tools.cpp @@ -17,7 +17,7 @@ #include "Tools.h" -#include +#include #include #include #include @@ -211,15 +211,22 @@ void wait(int ms) QString platform() { -#if defined(Q_WS_X11) - return "x11"; -#elif defined(Q_WS_MAC) - return "mac"; -#elif defined(Q_WS_WIN) - return "win"; -#else - return QString(); -#endif + // TODO: move callers to QApplication::platformName() + + QString platform = QApplication::platformName(); + + if (platform == "xcb") { + return "x11"; + } + else if (platform == "cocoa") { + return "mac"; + } + else if (platform == "windows") { + return "win"; + } + else { + return platform; + } } void disableCoreDumps()