Skip to content
GitLab
Commit 698a8268 authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.9' into 5.10 

 Conflicts:
	src/dialogs/qquickabstractfiledialog_p.h
	tests/auto/controls/data/tst_combobox.qml

Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
parents 314d1bdf eb048e48
Hide whitespace changes
Inline Side-by-side
Showing
with 72 additions and 32 deletions
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