AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d25c322729
qt5base-lts/src
History
Liang Qi d25c322729 Merge remote-tracking branch 'origin/5.13' into dev 
Conflicts:
	src/network/ssl/qsslsocket_openssl.cpp
	src/platformsupport/vkconvenience/qvkconvenience.cpp

Change-Id: I97ce6ed185f7fdad8102cc58d3cfec0119fd7bb4
2019-07-01 10:21:37 +02:00
..
3rdparty Merge remote-tracking branch 'origin/5.13' into dev 2019-07-01 10:21:37 +02:00
android Merge remote-tracking branch 'origin/5.13' into dev 2019-07-01 10:21:37 +02:00
angle Merge remote-tracking branch 'origin/5.12' into 5.13 2019-06-28 01:00:23 +02:00
concurrent Merge remote-tracking branch 'origin/5.13' into dev 2019-06-27 14:38:03 +02:00
corelib Merge remote-tracking branch 'origin/5.13' into dev 2019-07-01 10:21:37 +02:00
dbus Merge remote-tracking branch 'origin/5.13' into dev 2019-06-27 14:38:03 +02:00
gui Merge remote-tracking branch 'origin/5.13' into dev 2019-07-01 10:21:37 +02:00
network Merge remote-tracking branch 'origin/5.13' into dev 2019-07-01 10:21:37 +02:00
opengl Merge remote-tracking branch 'origin/5.13' into dev 2019-06-27 14:38:03 +02:00
openglextensions Move forward-declaration inside of namespace 2019-05-15 10:58:49 +00:00
platformheaders Merge remote-tracking branch 'origin/5.13' into dev 2019-06-27 14:38:03 +02:00
platformsupport Merge remote-tracking branch 'origin/5.12' into 5.13 2019-06-28 01:00:23 +02:00
plugins Merge remote-tracking branch 'origin/5.13' into dev 2019-07-01 10:21:37 +02:00
printsupport Merge remote-tracking branch 'origin/5.13' into dev 2019-06-27 14:38:03 +02:00
sql Fix build without feature.stringlistmodel 2019-06-30 17:16:52 +09:00
testlib QTestLib: Replace typedef by 'using' 2019-06-29 21:51:15 +02:00
tools rcc: Add -d option to output a Makefile-syntax depfile 2019-06-29 02:26:23 +02:00
widgets Merge remote-tracking branch 'origin/5.13' into dev 2019-07-01 10:21:37 +02:00
winmain Merge remote-tracking branch 'origin/5.13' into dev 2019-05-27 15:34:10 +02:00
xml Merge remote-tracking branch 'origin/5.13' into dev 2019-06-27 14:38:03 +02:00
src.pro qfloat16: Check in the tables to Git 2019-06-03 10:42:53 -07:00