1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.13' into 5.14

Browse Source 
Conflicts:
	sync.profile

Change-Id: I6f6d44ec285d37e64e430303ef9a87ac7aaf3eb9
This commit is contained in:
Qt Forward Merge Bot 2019-09-24 03:02:58 +02:00 committed by Johan Helsing
commit 45d5480224
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/wayland/fullscreenshellv1/fullscreenshellv1.pro
View File

@ -1,4 +1,4 @@
include (../shared_old/shared_old.pri) include (../shared_old/shared_old.pri)
TARGET = tst_client_fullscreenshell1 TARGET = tst_client_fullscreenshellv1
SOURCES += tst_fullscreenshellv1.cpp SOURCES += tst_fullscreenshellv1.cpp