Merge remote-tracking branch 'origin/5.4' into dev (aaff94c2) · Commits · BC / public / external / Qt / QtBase

There was an error fetching the commit references. Please try again later.

Commit aaff94c2 authored 10 years ago by

Frederik Gladhorn

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

Conflicts:
	src/corelib/tools/qbytearray.cpp
	src/gui/kernel/qplatformsystemtrayicon.cpp
	src/gui/kernel/qplatformsystemtrayicon.h
	src/plugins/platforms/xcb/xcb-plugin.pro

Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79

parents 2302d386 1196f691

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 90 additions and 71 deletions

Please register or to comment

Admin message

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