qt5base-lts/examples/widgets
Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
2015-10-23 14:45:03 +02:00
..
animation Use C++ <cmath> instead of <math.h> 2015-02-16 16:21:15 +00:00
desktop Merge remote-tracking branch 'origin/5.5' into 5.6 2015-10-02 16:59:55 +02:00
dialogs Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
doc Doc: Update obsolete URLs to external documentation 2015-10-02 10:14:47 +00:00
draganddrop Polish DnD Examples. 2015-10-09 15:59:21 +00:00
effects Use C++ <cmath> instead of <math.h> 2015-02-16 16:21:15 +00:00
gestures Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
graphicsview Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
itemviews Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
layouts Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
mac Link to AppKit instead of Cocoa. 2015-09-05 11:49:17 +00:00
mainwindows Fixed build breaks that result after disabling "contextmenu" feature 2015-09-09 07:33:58 +00:00
painting Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
richtext TextEdit example: fix build when clipboard is disabled. 2015-10-19 14:56:45 +00:00
scroller Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
statemachine Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
tools Merge remote-tracking branch 'origin/5.6' into dev 2015-10-14 15:45:35 +02:00
tutorials Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
widgets Image viewer example: Fix broken error message formatting. 2015-10-19 14:50:32 +00:00
windowcontainer Make the windowcontainer example more robust 2015-05-12 08:58:47 +00:00
widgets.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00