Merge pull request #6283 from aliallaoui/qt5
Compile fix for qxt third party
This commit is contained in:
commit
36cc5b82f4
|
@ -29,13 +29,8 @@
|
||||||
** <http://libqxt.org> <foundation@libqxt.org>
|
** <http://libqxt.org> <foundation@libqxt.org>
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#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
|
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include "keymapper_x11.h"
|
#include "keymapper_x11.h"
|
||||||
|
@ -92,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()
|
||||||
|
|
Loading…
Reference in New Issue