qt5base-lts/tests/auto/corelib/kernel
Liang Qi 4fe2fbcf82 Merge remote-tracking branch 'origin/5.6' into 5.7
This also reverts commit 018e670a26.

The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.

Conflicts:
	.qmake.conf
	src/corelib/io/qstandardpaths_mac.mm
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4
2016-02-18 20:50:35 +01: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 Updated license headers 2016-01-21 18:55:18 +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 "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00: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-02-18 20:50:35 +01:00
qpointer Updated license headers 2016-01-21 18:55:18 +00:00
qsharedmemory Updated license headers 2016-01-21 18:55:18 +00: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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qvariant Updated license headers 2016-01-21 18:55:18 +00: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