Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01:00
..
images	Doc: Move threading overviews from qtbase.git to qtdoc.git	2013-11-08 16:45:26 +01:00
snippets	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
src	doc: Clarify NOTIFY emission with MEMBER variables	2014-12-10 11:09:25 +01:00
qtcore.qdocconf	Move Qt Core examples under a common subdirectory	2014-10-17 14:57:13 +02:00