diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:02:58 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2019-09-24 10:27:35 +0000 |
commit | bd851ec8af95d9b6460282f334816a038cfd9150 (patch) | |
tree | 895cff19fdabf0ff5198cf57e67784695ddde1dc /tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro | |
parent | d8c19df22a1ff6ee40373a96fa12183acfc1b452 (diff) | |
parent | 8f6c41e49e320de9e0921801ab87a45f6e6f9fa9 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
sync.profile
Change-Id: I6f6d44ec285d37e64e430303ef9a87ac7aaf3eb9
Diffstat (limited to 'tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro')
-rw-r--r-- | tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro index 49d19d5c3..c4006cdd8 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 |