AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2889ebc903
qt5base-lts/tests/auto/corelib/io
History
Edward Welbourne f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
2016-08-01 18:20:00 +02:00
..
largefile QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00: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.7' into dev 2016-08-01 18:20:00 +02:00
qdataurl Updated license headers 2016-01-21 18:55:18 +00:00
qdebug Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
qdir Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
qdiriterator Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
qfile Merge remote-tracking branch 'origin/5.7' into dev 2016-05-03 15:49:15 +02:00
qfileinfo Fix/adapt the uses of {to,set,from}Time_t in the qtbase source code 2016-07-06 06:28:13 +00: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 Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00
qiodevice Revert blacklisting of two tests now the fix is in 2016-05-30 17:39:37 +00:00
qipaddress Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
qlockfile Add support for Apple tvOS 2016-05-17 16:11:23 +00:00
qloggingcategory Updated license headers 2016-01-21 18:55:18 +00:00
qloggingregistry Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qnodebug Updated license headers 2016-01-21 18:55:18 +00:00
qprocess Remove Windows CE vestiges 2016-06-02 08:03:37 +00:00
qprocess-noapplication Updated license headers 2016-01-21 18:55:18 +00:00
qprocessenvironment QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
qresourceengine Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qsavefile Updated license headers 2016-01-21 18:55:18 +00:00
qsettings Remove all code paths related to unsupported Apple platforms. 2016-06-04 09:24:33 +00:00
qstandardpaths Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
qstorageinfo Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
qtemporarydir Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qtemporaryfile Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qtextstream Revert blacklisting of two tests now the fix is in 2016-05-30 17:39:37 +00:00
qurl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-04 15:58:39 +02:00
qurlinternal Disallow non-character Unicode codepoints in QUrl/QUrlQuery 2016-04-26 23:08:11 +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 QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00