Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: Ie283d8861ecf11f21621ab18efdc780143559b52
2019-10-26 03:06:28 +02:00 · 2019-10-26 03:06:28 +02:00 · deef840f1f
commit deef840f1f
parent f8651a551d 87b4273398
1 changed files with 1 additions and 0 deletions
--- a/tests/auto/wayland/shared/corecompositor.cpp
+++ b/tests/auto/wayland/shared/corecompositor.cpp
@ -43,6 +43,7 @@ CoreCompositor::CoreCompositor()
        }
    })
 {
+    qputenv("WAYLAND_DISPLAY", m_socketName);
    m_timer.start();
    Q_ASSERT(isClean());
 }