Skip to content

Get back pre-Qt6 implementation of GetConnectionFromQt() #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mymedia2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Get back pre-Qt6 implementation of GetConnectionFromQt() #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions base/platform/linux/base_linux_xcb_utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
#include <QtCore/QAbstractNativeEventFilter>
#include <QtGui/QGuiApplication>

#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <qpa/qplatformnativeinterface.h>
#endif // Qt < 6.0.0

namespace base::Platform::XCB {
namespace {

Expand Down Expand Up @@ -104,13 +108,21 @@ class TimestampGetter : public QAbstractNativeEventFilter {
} // namespace

xcb_connection_t *GetConnectionFromQt() {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
using namespace QNativeInterface;
const auto native = qApp->nativeInterface<QX11Application>();
if (!native) {
return nullptr;
}

return native->connection();
#else // Qt >= 6.0.0
const auto native = QGuiApplication::platformNativeInterface();
if (!native) return nullptr;

return reinterpret_cast<xcb_connection_t*>(
native->nativeResourceForIntegration(QByteArray("connection")));
#endif // Qt >= 6.0.0
}

std::optional<xcb_timestamp_t> GetTimestamp() {
Expand Down