diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-03 03:01:35 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-03 07:24:14 +0200 |
| commit | 9f02bfedfe3b6b0b19d7c7a684a33b7544c84111 (patch) | |
| tree | 89ecc4e3c982338363540384aa895f6949630e89 /tests | |
| parent | f3668f88ccad6341280fbe2ca493562f80e76955 (diff) | |
| parent | cd2c3a8916a9cc7ab31f6e18e6f1510a048f4ace (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/client/qwaylandinputdevice.cpp
src/client/qwaylandwindow.cpp
Change-Id: Ifd64debc484197829d2fe412afa98c29b382efa5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/shared/mockcompositor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h index 3cb9b337c..fc4d7cc46 100644 --- a/tests/auto/client/shared/mockcompositor.h +++ b/tests/auto/client/shared/mockcompositor.h @@ -85,6 +85,7 @@ public: int main(int argc, char **argv) \ { \ setenv("XDG_RUNTIME_DIR", ".", 1); \ + setenv("XDG_CURRENT_DESKTOP", "qtwaylandtests", 1); \ setenv("QT_QPA_PLATFORM", "wayland", 1); \ test tc; \ QGuiApplication app(argc, argv); \ |