AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65ae3de2e1
qt5base-lts/tests/auto/corelib/kernel
History
Liang Qi 818014b449 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	configure
	src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
	src/widgets/widgets/qlineedit_p.cpp
	src/widgets/widgets/qlineedit_p.h
	src/winmain/winmain.pro
	tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
	tools/configure/configureapp.cpp

Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
2016-05-19 12:55:27 +02:00
..
qcoreapplication Updated license headers 2016-01-21 18:55:18 +00:00
qeventdispatcher Updated license headers 2016-01-21 18:55:18 +00:00
qeventloop tst_qeventloop: replace select with poll 2016-02-04 22:33:51 +00:00
qmath Updated license headers 2016-01-21 18:55:18 +00:00
qmetaenum Updated license headers 2016-01-21 18:55:18 +00:00
qmetamethod Updated license headers 2016-01-21 18:55:18 +00:00
qmetaobject Add a function to QMetaObject to check for inheritance 2016-03-15 16:36:22 +00:00
qmetaobjectbuilder Updated license headers 2016-01-21 18:55:18 +00:00
qmetaproperty Updated license headers 2016-01-21 18:55:18 +00:00
qmetatype Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
qmimedata Updated license headers 2016-01-21 18:55:18 +00:00
qobject Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00
qpointer Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
qsharedmemory Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
qsignalblocker Updated license headers 2016-01-21 18:55:18 +00:00
qsignalmapper Updated license headers 2016-01-21 18:55:18 +00:00
qsocketnotifier Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qsystemsemaphore Updated license headers 2016-01-21 18:55:18 +00:00
qtimer Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qtranslator Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qvariant Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
qwineventnotifier Updated license headers 2016-01-21 18:55:18 +00:00
kernel.pro iOS: Skip tests that don't make sense or don't work on the platform 2015-03-16 14:25:27 +00:00