Allan Sandfeld Jensen 4513cf47f1 Fix merge mistake in 'Avoid picking worse formats when ...' ... When spliting the patch the edit become an addition instead. Task-number: QTBUG-72785 Change-Id: I92105d0e23e9b8426228f4202d46fa41f928fb94 Reviewed-by: Christian Andersen <csandersen3@gmail.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>		2019-01-31 15:18:45 +00:00
..
3rdparty	Update bundled Freetype to 2.9.1	2019-01-31 10:40:41 +00:00
android	Add a string to the Android manifest to fix a lint warning	2019-01-29 20:08:46 +00:00
angle	configure: detect fxc.exe more thoroughly	2018-12-17 21:29:11 +00:00
concurrent	QtConcurrent: Unify license headers	2019-01-29 10:41:39 +00:00
corelib	Q(Date|Time)+::toString: correct account of format specifiers	2019-01-31 12:07:41 +00:00
dbus	QDBusConnection: prevent leaking connection/server on destroy	2018-11-28 11:19:34 +00:00
gui	Initialize bit_depth	2019-01-31 12:08:34 +00:00
network	Fix session resumption with OpenSSL 1.1	2019-01-31 10:36:50 +00:00
opengl	QtOpenGL: Unify license headers	2019-01-29 10:41:46 +00:00
openglextensions	QtOpenGLExtensions: Unify license headers	2019-01-11 11:06:25 +00:00
platformheaders	Ability to switch language under platform eglfs/linuxfb	2019-01-25 15:00:07 +00:00
platformsupport	Fix merge mistake in 'Avoid picking worse formats when ...'	2019-01-31 15:18:45 +00:00
plugins	QMacStyle - fix a weird NSBox geometry	2019-01-31 04:43:51 +00:00
printsupport	Fix license header for qprinterinfo.cpp	2019-01-22 15:21:05 +00:00
sql	Replace executedQuery when executing a new query	2019-01-30 23:08:04 +00:00
testlib	testlib: Add BXPASS and BXFAIL	2019-01-29 12:18:15 +00:00
tools	Merge remote-tracking branch 'origin/5.12.1' into 5.12	2019-01-23 10:13:29 +01:00
widgets	Fix regression in QPlainTextEdit updating	2019-01-31 11:59:23 +00:00
winmain	Use msvc qmake scope where appropriate	2018-11-22 14:16:52 +00:00
xml	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-11-09 10:34:33 +01:00
src.pro