summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:02:58 +0200
committerJohan Helsing <johan.helsing@qt.io>2019-09-24 10:27:35 +0000
commitbd851ec8af95d9b6460282f334816a038cfd9150 (patch)
tree895cff19fdabf0ff5198cf57e67784695ddde1dc /tests
parentd8c19df22a1ff6ee40373a96fa12183acfc1b452 (diff)
parent8f6c41e49e320de9e0921801ab87a45f6e6f9fa9 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: sync.profile Change-Id: I6f6d44ec285d37e64e430303ef9a87ac7aaf3eb9
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro2
-rw-r--r--tests/auto/compositor/compositor/mockclient.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro
index 49d19d5c..c4006cdd 100644
--- a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro
+++ b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro
@@ -1,4 +1,4 @@
include (../shared_old/shared_old.pri)
-TARGET = tst_client_fullscreenshell1
+TARGET = tst_client_fullscreenshellv1
SOURCES += tst_fullscreenshellv1.cpp
diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h
index 69a0e47c..89d0a0b3 100644
--- a/tests/auto/compositor/compositor/mockclient.h
+++ b/tests/auto/compositor/compositor/mockclient.h
@@ -36,6 +36,7 @@
#include <QImage>
#include <QRect>
#include <QList>
+#include <QtCore/QMap>
#include <QWaylandOutputMode>
#include "mockxdgoutputv1.h"