From 861322355e29a22105ee0809dc3fb68940573335 Mon Sep 17 00:00:00 2001 From: MOZGIII Date: Sat, 26 Sep 2015 23:13:32 +0300 Subject: [PATCH] Enabled compatibilty with Qt 5.2.1 on for X11 --- src/widgets/x11/qxtglobalshortcut_x11.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/widgets/x11/qxtglobalshortcut_x11.cpp b/src/widgets/x11/qxtglobalshortcut_x11.cpp index f74d6e87..c0f9e36a 100644 --- a/src/widgets/x11/qxtglobalshortcut_x11.cpp +++ b/src/widgets/x11/qxtglobalshortcut_x11.cpp @@ -29,15 +29,11 @@ ** *****************************************************************************/ +#include #include #include -#if QT_VERSION < QT_VERSION_CHECK(5,0,0) -# include -#else -# include -# include -# include -#endif +#include +#include namespace { @@ -91,14 +87,7 @@ class QxtX11Data { public: QxtX11Data() { -#if QT_VERSION < QT_VERSION_CHECK(5,0,0) m_display = QX11Info::display(); -#else - QPlatformNativeInterface *native = qApp->platformNativeInterface(); - void *display = native->nativeResourceForScreen(QByteArray("display"), - QGuiApplication::primaryScreen()); - m_display = reinterpret_cast(display); -#endif } bool isValid()