Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: sync.profile Change-Id: I6f6d44ec285d37e64e430303ef9a87ac7aaf3eb9
This commit is contained in:
commit
45d5480224
@ -1,4 +1,4 @@
|
||||
include (../shared_old/shared_old.pri)
|
||||
|
||||
TARGET = tst_client_fullscreenshell1
|
||||
TARGET = tst_client_fullscreenshellv1
|
||||
SOURCES += tst_fullscreenshellv1.cpp
|
||||
|
Loading…
x
Reference in New Issue
Block a user