diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-19 03:02:05 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-21 09:23:06 +0200 |
| commit | 29fcb97446ae2c1d89e537f3a04c5a87a275e3bd (patch) | |
| tree | a53fb92cbf40f9c167e821676c5780727a50ce10 /tests/auto/compositor/compositor | |
| parent | bb1b46a4862e0a562b8f55e3410394492bd48b1f (diff) | |
| parent | 9f5b96225885f927727a57b6123d8550d6c373bb (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/client/qwaylandwindow.cpp
tests/auto/compositor/compositor/tst_compositor.cpp
Change-Id: Iacfcae577a4a99c847694ae3a2c6e3e9ae050817
Diffstat (limited to 'tests/auto/compositor/compositor')
| -rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 7fbe8979b..e87fab2a8 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -121,10 +121,15 @@ private slots: void idleInhibit(); void xdgOutput(); + +private: + QTemporaryDir m_tmpRuntimeDir; }; void tst_WaylandCompositor::init() { - qputenv("XDG_RUNTIME_DIR", "."); + // We need to set a test specific runtime dir so we don't conflict with other tests' + // compositors by accident. + qputenv("XDG_RUNTIME_DIR", m_tmpRuntimeDir.path().toLocal8Bit()); } void tst_WaylandCompositor::singleClient() |