Merge pull request #6283 from aliallaoui/qt5

Compile fix for qxt third party
This commit is contained in:
John Maguire 2019-02-13 15:02:56 +11:00 committed by GitHub
commit 36cc5b82f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions

View File

@ -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 <QX11Info>
#include <xcb/xcb.h>
#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()