dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add compile test for QX11Application

Browse Source 
if Qt was compiled without XCB, globalshortcut-x11 failed to compile.
This commit is contained in:
Jonas Kvinge
2023-04-07 15:53:29 +02:00
parent bf9aa524ed
commit 7313db5ac0
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h.in
View File

@@ -55,4 +55,6 @@
#cmakedefine USE_TAGLIB
#cmakedefine USE_TAGPARSER
#cmakedefine HAVE_QX11APPLICATION
#endif // CONFIG_H_IN

10
src/globalshortcuts/globalshortcut-x11.cpp
View File

@@ -35,7 +35,7 @@
#include <xcb/xcb.h>
#include <xcb/xproto.h>
#if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
#ifndef HAVE_QX11APPLICATION
# if defined(HAVE_X11EXTRAS)
# include <QX11Info>
# elif defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
@@ -49,7 +49,7 @@ namespace {
Display *X11Display() {
#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) // 6.2: Use the new native interface.
#ifdef HAVE_QX11APPLICATION // Qt 6.2: Use the new native interface.
if (!qApp) return nullptr;
@@ -73,7 +73,7 @@ Display *X11Display() {
#else
# error "Missing Qt >= 6.2, X11Extras or qpa/qplatformnativeinterface.h header."
# error "Missing QX11Application, X11Extras or qpa/qplatformnativeinterface.h header."
#endif
@@ -81,7 +81,7 @@ Display *X11Display() {
quint32 AppRootWindow() {
#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) // 6.2: Use the new native interface.
#ifdef HAVE_QX11APPLICATION // Qt 6.2: Use the new native interface.
if (QNativeInterface::QX11Application *x11_app = qApp->nativeInterface<QNativeInterface::QX11Application>()) {
if (x11_app->display()) {
@@ -108,7 +108,7 @@ quint32 AppRootWindow() {
#else
# error "Missing Qt >= 6.2, X11Extras or qpa/qplatformnativeinterface.h header."
# error "Missing QX11Application, X11Extras or qpa/qplatformnativeinterface.h header."
#endif