qt5base-lts/examples/widgets/doc
Liang Qi 6a772fd201 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/win32-g++/qmake.conf
	mkspecs/win32-icc/qmake.conf
	src/platformsupport/fontdatabases/mac/coretext.pri
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
2017-05-29 10:54:41 +02:00
..
images Doc: update Qt Widgets examples 2016-12-12 14:43:02 +00:00
src Merge remote-tracking branch 'origin/5.9' into dev 2017-05-29 10:54:41 +02:00
dropsite.qdoc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +02:00
mousebuttons.qdoc Unify license header usage. 2016-03-29 10:20:03 +00:00