1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qgenericunixservices: Move x11 specific code to the Xcb backend

Browse Source 
QGenericUnixServices is an abstract class subclassed by the wayland
backend for wayland specific functionality. This moves to a consistent
pattern where X11 code is also the X11 backend rather than guarded with
if statements.

Change-Id: I1cc7ebac811463451d744fdc034f5ad5fd022bc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
David Edmundson 2023-06-01 23:15:44 +01:00
parent d2a73883ae
commit d0a5866f6f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/platform/unix/qgenericunixservices.cpp
View File

@ -554,9 +554,7 @@ QPlatformServiceColorPicker *QGenericUnixServices::colorPicker(QWindow *parent)
QString QGenericUnixServices::portalWindowIdentifier(QWindow *window)
{
if (QGuiApplication::platformName() == QLatin1String("xcb"))
return "x11:"_L1 + QString::number(window->winId(), 16);
Q_UNUSED(window);
return QString();
}

14
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -93,10 +93,17 @@ static bool runningUnderDebugger()
#endif
}
class QXcbUnixServices : public QGenericUnixServices
{
public:
QString portalWindowIdentifier(QWindow *window) override;
};
QXcbIntegration *QXcbIntegration::m_instance = nullptr;
QXcbIntegration::QXcbIntegration(const QStringList &parameters, int &argc, char **argv)
: m_services(new QGenericUnixServices)
: m_services(new QXcbUnixServices)
, m_instanceName(nullptr)
, m_canGrab(true)
, m_defaultVisualId(UINT_MAX)
@ -593,4 +600,9 @@ void QXcbIntegration::setApplicationBadge(qint64 number)
unixServices->setApplicationBadge(number);
}
QString QXcbUnixServices::portalWindowIdentifier(QWindow *window)
{
return "x11:"_L1 + QString::number(window->winId(), 16);
}
QT_END_NAMESPACE