AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88cf044580
qt5base-lts/src
History
Liang Qi 88cf044580 Merge remote-tracking branch 'origin/5.9' into 5.10 
Conflicts:
	src/gui/kernel/qwindow.cpp
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
	tests/auto/widgets/kernel/qaction/tst_qaction.cpp

Change-Id: Ifa515dc0ece7eb1471b00c1214149629a7e6a233
2017-11-09 11:47:57 +01:00
..
3rdparty Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00
android Forward Service.onBind notification to Qt 2017-07-04 18:38:19 +00:00
angle ANGLE: Fix compilation with MinGW 2017-10-16 15:47:03 +00:00
concurrent Adapt to the C++ SIC introduced by P0012: noexcept specialization 2017-05-03 02:39:56 +00:00
corelib Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00
dbus Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-30 08:54:05 +01:00
gui Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00
network Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00
opengl Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
openglextensions Also release winmain, qopenglextensions under commercial licenses 2016-11-18 16:19:56 +00:00
platformheaders Merge remote-tracking branch 'origin/5.9' into dev 2017-04-20 12:31:27 +02:00
platformsupport Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00
plugins Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00
printsupport Printsupport: Not necessary to call setLayout when we added the parent 2017-10-12 16:45:05 +00:00
sql Merge remote-tracking branch 'origin/5.9' into 5.10 2017-09-20 11:58:32 +02:00
testlib Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00
tools Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-30 08:54:05 +01:00
widgets Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01: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.9' into dev 2017-03-28 09:28:31 +02:00