qt5base-lts/examples/widgets
Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
2014-11-24 13:39:13 +01:00
..
animation New Qt logo 2014-11-05 08:10:42 +01:00
desktop Balloon tip must follow systemtray icon 2014-09-25 16:12:55 +02:00
dialogs Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
doc New Qt logo 2014-11-05 08:10:42 +01:00
draganddrop New Qt logo 2014-11-05 08:10:42 +01:00
effects Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
gestures Add debug output for QGestureEvent and QGesture classes. 2014-09-30 16:16:51 +02:00
graphicsview New Qt logo 2014-11-05 08:10:42 +01:00
itemviews New Qt logo 2014-11-05 08:10:42 +01:00
layouts Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
mac fix qmaccocoaviewcontainer example 2014-06-05 17:11:58 +02:00
mainwindows Polish the mdi example. 2014-09-24 23:07:25 +02:00
painting New Qt logo 2014-11-05 08:10:42 +01:00
richtext Update license headers and add new license files 2014-09-24 12:26:19 +02:00
scroller Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
statemachine Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
tools Update license headers and add new license files 2014-09-24 12:26:19 +02:00
tutorials Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
widgets New Qt logo 2014-11-05 08:10:42 +01:00
windowcontainer Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
widgets.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00