Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

[qxt] No need to check qt versionat all, Qt 5.6 is required. 

So just use QX11Info
This commit is contained in:
Ali Allaoui 2019-02-09 16:06:16 +01:00
parent 85558d242c
commit 1176d9eb93
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
3rdparty/qxt/qxtglobalshortcut_x11.cpp vendored
View File

@ -29,16 +29,8 @@
** <http://libqxt.org> <foundation@libqxt.org> ** <http://libqxt.org> <foundation@libqxt.org>
*****************************************************************************/ *****************************************************************************/
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) || QT_VERSION > QT_VERSION_CHECK(5,6,0) #include <QX11Info>
# include <QX11Info> #include <xcb/xcb.h>
#if QT_VERSION > QT_VERSION_CHECK(5,6,0)
# include <xcb/xcb.h>
#endif
#else
# include <QApplication>
# include <qpa/qplatformnativeinterface.h>
# include <xcb/xcb.h>
#endif
#include <QVector> #include <QVector>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "keymapper_x11.h" #include "keymapper_x11.h"
@ -95,14 +87,7 @@ class QxtX11Data {
public: public:
QxtX11Data() QxtX11Data()
{ {
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) || QT_VERSION > QT_VERSION_CHECK(5,6,0)
m_display = QX11Info::display(); m_display = QX11Info::display();
#else
QPlatformNativeInterface *native = qApp->platformNativeInterface();
void *display = native->nativeResourceForScreen(QByteArray("display"),
QGuiApplication::primaryScreen());
m_display = reinterpret_cast<Display *>(display);
#endif
} }
bool isValid() bool isValid()