Merge pull request #6283 from aliallaoui/qt5
Compile fix for qxt third party
This commit is contained in:
commit
36cc5b82f4
12
3rdparty/qxt/qxtglobalshortcut_x11.cpp
vendored
12
3rdparty/qxt/qxtglobalshortcut_x11.cpp
vendored
@ -29,13 +29,8 @@
|
||||
** <http://libqxt.org> <foundation@libqxt.org>
|
||||
*****************************************************************************/
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
|
||||
#include <QX11Info>
|
||||
#else
|
||||
# include <QApplication>
|
||||
# include <qpa/qplatformnativeinterface.h>
|
||||
#include <xcb/xcb.h>
|
||||
#endif
|
||||
#include <QVector>
|
||||
#include <X11/Xlib.h>
|
||||
#include "keymapper_x11.h"
|
||||
@ -92,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 *>(display);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool isValid()
|
||||
|
Loading…
x
Reference in New Issue
Block a user