Liang Qi ef37ab9970 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/android/qandroidinputcontext.cpp src/widgets/styles/qstylesheetstyle.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b		2019-06-25 13:04:27 +02:00
..
animation	QtWidgets: replace 0 with \nullptr in documentation	2019-01-28 19:37:26 +00:00
desktop	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-03-20 14:09:30 +01:00
dialogs	QFileDialog: mark obsolete enum DontUseSheet as deprecated	2019-05-17 14:08:34 +00:00
doc	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00
draganddrop	DropSite example: fix documentation	2018-12-10 18:38:56 +00:00
effects	Cleanup Widgets examples - new signal/slot syntax	2019-01-06 17:08:03 +00:00
gestures	Cleanup Widgets examples - foreach	2019-01-23 18:49:05 +00:00
graphicsview	Convert uses of QTime as a timer to QElapsedTimer	2019-06-14 10:42:33 +02:00
itemviews	Fix some deprecation warnings in examples	2019-02-06 22:12:23 +00:00
layouts	QtBase: compile examples with QT_DISABLE_DEPRECATED_BEFORE=0x050d00	2019-02-13 05:55:46 +00:00
mac	macOS: Make QMacNativeWidget example more usable	2017-02-12 12:29:55 +00:00
mainwindows	Use QSaveFile in MainWindow examples	2019-06-12 09:29:31 +02:00
painting	Convert uses of QTime as a timer to QElapsedTimer	2019-06-14 10:42:33 +02:00
qnx/foreignwindows	Basic foreign window support for QNX	2019-05-01 13:49:18 +00:00
richtext	Fix heading level in style combobox in TextEdit example	2019-05-06 19:25:12 +00:00
scroller	Cleanup Widgets examples - foreach	2019-01-23 18:49:05 +00:00
statemachine	factorial example: Fix issue with WinRT console output	2019-04-03 13:59:47 +00:00
tools	examples: port away from Java-style iterators	2019-05-23 17:30:51 +02:00
touch	Cleanup Widgets examples - foreach	2019-01-07 13:15:59 +00:00
tutorials	Cleanup Widgets examples - foreach	2019-01-07 13:15:59 +00:00
widgets	Icons example: use std::unique_ptr instead of QScopedPointer	2019-05-15 11:03:53 +02:00
windowcontainer	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
widgets.pro	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-10-17 10:35:28 +02:00