From 85558d242ccb795269654b2ff3bc6ec169b47f3c Mon Sep 17 00:00:00 2001 From: Ali Allaoui Date: Fri, 18 Jan 2019 16:36:52 +0100 Subject: [PATCH] [qxt] Compil fix for qt version > 5.6 --- 3rdparty/qxt/qxtglobalshortcut_x11.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/3rdparty/qxt/qxtglobalshortcut_x11.cpp b/3rdparty/qxt/qxtglobalshortcut_x11.cpp index 9ddb1e088..1b670e52f 100644 --- a/3rdparty/qxt/qxtglobalshortcut_x11.cpp +++ b/3rdparty/qxt/qxtglobalshortcut_x11.cpp @@ -29,8 +29,11 @@ ** *****************************************************************************/ -#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) || QT_VERSION > QT_VERSION_CHECK(5,6,0) # include +#if QT_VERSION > QT_VERSION_CHECK(5,6,0) +# include +#endif #else # include # include @@ -92,7 +95,7 @@ class QxtX11Data { public: QxtX11Data() { -#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) || QT_VERSION > QT_VERSION_CHECK(5,6,0) m_display = QX11Info::display(); #else QPlatformNativeInterface *native = qApp->platformNativeInterface();