AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
902a5e7aaa
qt5base-lts/tests/auto/corelib/kernel
History
Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
2016-06-06 09:04:55 +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-06-06 09:04:55 +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