qt5base-lts/tests/auto/other
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
..
android Updated license headers 2016-01-21 18:55:18 +00:00
atwrapper Updated license headers 2016-01-21 18:55:18 +00:00
compiler Update the Intel copyright year 2016-01-21 22:44:16 +00:00
gestures Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
lancelot Updated license headers 2016-01-21 18:55:18 +00:00
languagechange Updated license headers 2016-01-21 18:55:18 +00:00
macgui Updated license headers 2016-01-21 18:55:18 +00:00
macnativeevents Updated license headers 2016-01-21 18:55:18 +00:00
macplist Updated license headers 2016-01-21 18:55:18 +00:00
modeltest Updated license headers 2016-01-21 18:55:18 +00:00
networkselftest Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
qaccessibility Updated license headers 2016-01-21 18:55:18 +00:00
qaccessibilitylinux Updated license headers 2016-01-21 18:55:18 +00:00
qaccessibilitymac Updated license headers 2016-01-21 18:55:18 +00:00
qcomplextext Updated license headers 2016-01-21 18:55:18 +00:00
qfocusevent Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkaccessmanager_and_qprogressdialog Updated license headers 2016-01-21 18:55:18 +00:00
qobjectperformance Updated license headers 2016-01-21 18:55:18 +00:00
qobjectrace Updated license headers 2016-01-21 18:55:18 +00:00
qprocess_and_guieventloop Update the Intel copyright year 2016-01-21 22:44:16 +00:00
qsharedpointer_and_qwidget Updated license headers 2016-01-21 18:55:18 +00:00
qtokenautomaton Updated license headers 2016-01-21 18:55:18 +00:00
qvariant_common Updated license headers 2016-01-21 18:55:18 +00:00
toolsupport Adapt QFileDevice to use QIODevice's write buffer 2016-01-29 09:14:36 +00:00
windowsmobile Updated license headers 2016-01-21 18:55:18 +00:00
other.pro fix usage of wince scope 2015-06-05 10:29:10 +00:00