Skip to content
GitLab
Commit 91cd146e authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot Committed by Edward Welbourne
Browse files

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

 Conflicts:
	.qmake.conf

Change-Id: Ic20d930b8efc843c39c6ab2af5848612d27fd661
parents 32e9527e 76260fce
dev 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 6.2 6.2.0 6.2.1 6.2.2 wip/cmake wip/win v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 10612 additions and 0 deletions
tests/auto/bic/data/QtBluetooth.5.13.0.linux-gcc-amd64.txt 0 → 100644
+ 5423
− 0
View file @ 91cd146e
This diff is collapsed.
tests/auto/bic/data/QtNfc.5.13.0.linux-gcc-amd64.txt 0 → 100644
+ 5189
− 0
View file @ 91cd146e
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment