Skip to content
GitLab
Commit 0963be63 authored by Paul Olav Tvete's avatar Paul Olav Tvete
Browse files

Merge remote-tracking branch 'qt/dev' into dev-highdpi 

Conflicts:
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface_p.h
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
parents 9e6a1351 eacfbbf6
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 240 additions and 82 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