Merge commit '209a26c6c4187a15cc6297000ad729392aac6454' into nacl-5.6 (0008bb24) · Commits · BC / public / external / Qt / QtBase

Commit 0008bb24 authored 9 years ago by

Morten Johan Sørvig

Merge commit '209a26c6' into nacl-5.6

Conflicts:
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface.h
	src/gui/kernel/qwindowsysteminterface_p.h
	src/network/access/qnetworkaccessmanager.cpp
	src/plugins/plugins.pro

Change-Id: I0029184e6cba6f55bed736d3574a7fce215ac03f

parents 05389fd0 209a26c6

wip/nacl

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1023 additions and 143 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment