MrBesen/QxtGlobalShortcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enabled compatibilty with Qt 5.2.1 on for X11

Browse Source
This commit is contained in:
MOZGIII 2015-09-26 23:13:32 +03:00
parent 36645a5a74
commit 861322355e
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/x11/qxtglobalshortcut_x11.cpp
View File

@ -29,15 +29,11 @@
** <http://libqxt.org> <foundation@libqxt.org> ** <http://libqxt.org> <foundation@libqxt.org>
*****************************************************************************/ *****************************************************************************/
#include <QApplication>
#include <QVector> #include <QVector>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #include <QX11Info>
# include <QX11Info> #include <xcb/xcb.h>
#else
# include <QApplication>
# include <qpa/qplatformnativeinterface.h>
# include <xcb/xcb.h>
#endif
namespace { namespace {
@ -91,14 +87,7 @@ class QxtX11Data {
public: public:
QxtX11Data() QxtX11Data()
{ {
#if QT_VERSION < QT_VERSION_CHECK(5,0,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()