diff options
| author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-03-28 01:16:56 +0400 |
|---|---|---|
| committer | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-04-03 19:45:49 +0400 |
| commit | 2eb17abf4262b467140ed4262320bf60cbda3ba2 (patch) | |
| tree | 4f6b4fcf76ef43560e967ac034e65167da23fc11 /src/plugins/platforms/qwayland-generic/main.cpp | |
| parent | b66d93c6b827ef2d194916c68f1f64fe874d5163 (diff) | |
| download | qtwayland-2eb17abf4262b467140ed4262320bf60cbda3ba2.tar.gz | |
Client: Check for shell integration when initializing platform plugin
This makes QWaylandDisplay::initialize return a boolean and moves the
QWaylandIntegration's failure check out of constructor as
QWaylandIntegration::shellIntegration is a virtual method, this also
removes the out-of-date comments about processEvents as it's no more
used in QWaylandDisplay::forceRoundTrip.
Fixes: QTBUG-102457
Pick-to: 6.5
Change-Id: I3c8f1d9fd195326b587b45318443c2beee1ebfc2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (limited to 'src/plugins/platforms/qwayland-generic/main.cpp')
| -rw-r--r-- | src/plugins/platforms/qwayland-generic/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp index 0c5087d6..a3486d0d 100644 --- a/src/plugins/platforms/qwayland-generic/main.cpp +++ b/src/plugins/platforms/qwayland-generic/main.cpp @@ -22,7 +22,7 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c Q_UNUSED(system); auto *integration = new QWaylandIntegration(); - if (integration->hasFailed()) { + if (!integration->init()) { delete integration; integration = nullptr; } |