diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-31 11:14:47 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-31 11:15:47 +0100 |
| commit | d4ac2c9915fed87193cd2cf7ac438a9fa8edc126 (patch) | |
| tree | 7b2bf83f9de1de3aaeb683b8d9e6b4106a611152 /tests | |
| parent | b148226e21c5e701faa615dcd24b23c9c9b29be8 (diff) | |
| parent | 37cb6f0f35030420c7d37a126f817cac73aeed97 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
Change-Id: If2159587c5183fcf57558f045bd9af2f25c8289f
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/client/iviapplication/tst_iviapplication.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp b/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp index f93d9fbc5..55158474c 100644 --- a/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp +++ b/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp @@ -93,7 +93,8 @@ void tst_WaylandClientFullScreenShellV1::createDestroyWindow() int main(int argc, char **argv) { - setenv("XDG_RUNTIME_DIR", ".", 1); + QTemporaryDir tmpRuntimeDir; + setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1); setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin setenv("QT_WAYLAND_SHELL_INTEGRATION", "fullscreen-shell-v1", 1); setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); // window decorations don't make much sense here diff --git a/tests/auto/client/iviapplication/tst_iviapplication.cpp b/tests/auto/client/iviapplication/tst_iviapplication.cpp index 59ff6f555..8d6ea6484 100644 --- a/tests/auto/client/iviapplication/tst_iviapplication.cpp +++ b/tests/auto/client/iviapplication/tst_iviapplication.cpp @@ -124,7 +124,8 @@ void tst_WaylandClientIviApplication::uniqueIviIds() int main(int argc, char **argv) { - setenv("XDG_RUNTIME_DIR", ".", 1); + QTemporaryDir tmpRuntimeDir; + setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1); setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin setenv("QT_WAYLAND_SHELL_INTEGRATION", "ivi-shell", 1); setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); // window decorations don't make much sense on ivi-application diff --git a/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp b/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp index 027e1dfa8..e44475de7 100644 --- a/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp +++ b/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp @@ -422,7 +422,8 @@ void tst_WaylandClientXdgShellV6::dontSpamExposeEvents() int main(int argc, char **argv) { - setenv("XDG_RUNTIME_DIR", ".", 1); + QTemporaryDir tmpRuntimeDir; + setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1); setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin setenv("QT_WAYLAND_SHELL_INTEGRATION", "xdg-shell-v6", 1); |