Frederik Gladhorn ca524e5b70 Merge remote-tracking branch 'origin/5.3' into 5.4 ... Manually included changes from 3a347a4e70 in src/opengl/qgl.cpp. Conflicts: src/opengl/qgl_qpa.cpp src/plugins/platforms/android/androidjnimain.cpp Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929		2014-08-12 13:05:02 +02:00
..
images	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
example.html	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
main.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
textedit.cpp	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-08-12 13:05:02 +02:00
textedit.h	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
textedit.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
textedit.qdoc	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
textedit.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00