summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/client/qwaylanddisplay.cpp4
-rw-r--r--src/client/qwaylanddisplay_p.h2
-rw-r--r--src/client/qwaylandshmbackingstore.cpp2
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp2
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 43f9443fb..1040c3b7a 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -391,6 +391,8 @@ bool QWaylandDisplay::initialize()
forceRoundTrip();
+ emit connected();
+
if (!mWaitingScreens.isEmpty()) {
// Give wl_output.done and zxdg_output_v1.done events a chance to arrive
forceRoundTrip();
@@ -481,8 +483,6 @@ void QWaylandDisplay::reconnect()
wl_event_queue_destroy(m_frameEventQueue);
initEventThread();
- emit reconnected();
-
auto needsRecreate = [](QPlatformWindow *window) {
return window && !static_cast<QWaylandWindow *>(window)->wlSurface();
};
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index 477a5dbf2..e647f41c0 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -259,7 +259,7 @@ public Q_SLOTS:
void flushRequests();
Q_SIGNALS:
- void reconnected();
+ void connected();
void globalAdded(const RegistryGlobal &global);
void globalRemoved(const RegistryGlobal &global);
diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
index fc5e78221..723b264d5 100644
--- a/src/client/qwaylandshmbackingstore.cpp
+++ b/src/client/qwaylandshmbackingstore.cpp
@@ -137,7 +137,7 @@ QWaylandShmBackingStore::QWaylandShmBackingStore(QWindow *window, QWaylandDispla
: QPlatformBackingStore(window)
, mDisplay(display)
{
- QObject::connect(mDisplay, &QWaylandDisplay::reconnected, window, [this]() {
+ QObject::connect(mDisplay, &QWaylandDisplay::connected, window, [this]() {
auto copy = mBuffers;
// clear available buffers so we create new ones
// actual deletion is deferred till after resize call so we can copy
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
index f4ed8cd61..e6258893a 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
@@ -24,7 +24,7 @@ QWaylandEglWindow::QWaylandEglWindow(QWindow *window, QWaylandDisplay *display)
, m_clientBufferIntegration(static_cast<QWaylandEglClientBufferIntegration *>(mDisplay->clientBufferIntegration()))
, m_format(window->requestedFormat())
{
- connect(display, &QWaylandDisplay::reconnected, this, [this] {
+ connect(display, &QWaylandDisplay::connected, this, [this] {
m_clientBufferIntegration = static_cast<QWaylandEglClientBufferIntegration *>(
mDisplay->clientBufferIntegration());
});
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index 685ad1e4d..472ef5fbf 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -195,7 +195,7 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis
const QSurfaceFormat &fmt, QPlatformOpenGLContext *share)
: QEGLPlatformContext(fmt, share, eglDisplay), m_display(display)
{
- m_reconnectionWatcher = QObject::connect(m_display, &QWaylandDisplay::reconnected, [this]() {
+ m_reconnectionWatcher = QObject::connect(m_display, &QWaylandDisplay::connected, [this]() {
invalidateContext();
});