whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src
History
Liang Qi 0fc569184c Merge remote-tracking branch 'origin/5.8' into 5.9 
Conflicts:
	src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
	src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
	src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
	src/widgets/widgets/qtabbar.cpp

Change-Id: Iaa9daee5f7a6490d56257a3824730a35751ceb05
 		2017-04-06 14:16:31 +02:00
..
3rdparty Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-27 10:42:08 +02:00
android Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-28 12:18:11 +02:00
angle ANGLE: remove dead MinGW code from common.pri 2017-03-28 06:29:43 +00:00
concurrent Merge remote-tracking branch 'origin/5.8' into 5.9 2017-04-06 14:16:31 +02:00
corelib Merge remote-tracking branch 'origin/5.8' into 5.9 2017-04-06 14:16:31 +02:00
dbus Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 15:55:44 +01:00
gui Merge remote-tracking branch 'origin/5.8' into 5.9 2017-04-06 14:16:31 +02:00
network Fix GCC warning about dereferencing type-punned pointers 2017-04-06 04:14:58 +00:00
opengl Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 15:55:44 +01:00
openglextensions
…
platformheaders XCB: Replace LGPL21 with LGPL license header 2017-02-28 15:34:58 +00:00
platformsupport Merge remote-tracking branch 'origin/5.8' into 5.9 2017-04-06 14:16:31 +02:00
plugins Merge remote-tracking branch 'origin/5.8' into 5.9 2017-04-06 14:16:31 +02:00
printsupport Prefer rvalue version of toLocal8Bit() 2017-03-30 20:30:19 +00:00
sql Merge remote-tracking branch 'origin/5.8' into 5.9 2017-04-06 14:16:31 +02:00
testlib Prefer rvalue versions of toLatin() and toUtf8() 2017-03-30 20:31:59 +00:00
tools Prefer rvalue versions of toLatin() and toUtf8() 2017-03-30 20:31:59 +00:00
widgets Merge remote-tracking branch 'origin/5.8' into 5.9 2017-04-06 14:16:31 +02:00
winmain Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-08 15:49:18 +01:00
xml Prefer rvalue versions of toLatin() and toUtf8() 2017-03-30 20:31:59 +00:00
src.pro Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-27 10:42:08 +02:00