qt5base-lts/tests/auto/corelib/io
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
..
largefile Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qabstractfileengine Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qbuffer Updated license headers 2016-01-21 18:55:18 +00:00
qdatastream Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qdataurl Updated license headers 2016-01-21 18:55:18 +00:00
qdebug Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qdir Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qdiriterator Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qfile Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qfileinfo Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qfileselector Fix QFileSelectorPrivate::addStatics() 2016-02-12 14:10:29 +00:00
qfilesystementry Updated license headers 2016-01-21 18:55:18 +00:00
qfilesystemwatcher Updated license headers 2016-01-21 18:55:18 +00:00
qiodevice QIODevice: add infrastructure for multistreaming 2016-01-27 06:32:30 +00:00
qipaddress Updated license headers 2016-01-21 18:55:18 +00:00
qlockfile Updated license headers 2016-01-21 18:55:18 +00:00
qloggingcategory Updated license headers 2016-01-21 18:55:18 +00:00
qloggingregistry Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qnodebug Updated license headers 2016-01-21 18:55:18 +00:00
qprocess Stabilize tst_QProcess::softExitInSlots() 2016-02-01 16:39:23 +00:00
qprocess-noapplication Updated license headers 2016-01-21 18:55:18 +00:00
qprocessenvironment Updated license headers 2016-01-21 18:55:18 +00:00
qresourceengine Updated license headers 2016-01-21 18:55:18 +00:00
qsavefile Updated license headers 2016-01-21 18:55:18 +00:00
qsettings Updated license headers 2016-01-21 18:55:18 +00:00
qstandardpaths Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qstorageinfo Updated license headers 2016-01-21 18:55:18 +00:00
qtemporarydir Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qtemporaryfile tst_QTemporaryFile: test value of openMode() after open(). 2016-02-15 13:53:51 +00:00
qtextstream Updated license headers 2016-01-21 18:55:18 +00:00
qurl Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qurlinternal Updated license headers 2016-01-21 18:55:18 +00:00
qurlquery Updated license headers 2016-01-21 18:55:18 +00:00
qwinoverlappedionotifier Updated license headers 2016-01-21 18:55:18 +00:00
io.pro winrt: msvc2015: refactor file handling 2016-01-21 05:53:17 +00:00