AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6c5de416c9
qt5base-lts/tests/auto/corelib/io
History
Edward Welbourne 6c5de416c9 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/corelib/io/qtemporarydir.cpp
One side encapsulated a repeated piece of #if-ery in a local define;
the other added to the #if-ery.  Made its addition to the other's.

	src/corelib/kernel/qeventdispatcher_unix_p.h
One side moved some members into a struct; this collided with a #undef
check that neither side now has.  Discarded the #undef part.

	src/gui/opengl/qopengltexturehelper_p.h
5.7 deleted a bunch of methods; not clear why merge got confused.

	src/tools/moc/moc.cpp
One added a name to the copyright header; another changed its URL.

Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa
2016-07-26 10:43:29 +02: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 QDataStream: adjust containers' deserialization in transaction mode 2016-07-20 06:52:43 +00: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.6' into 5.7 2016-06-10 23:27:10 +02:00
qdiriterator Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
qfile Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
qfileinfo Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02: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 Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qiodevice Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qipaddress Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
qlockfile Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02: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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-23 08:29:43 +01: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 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 Updated license headers 2016-01-21 18:55:18 +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.6' into 5.7 2016-05-19 12:55:27 +02:00
qtemporarydir Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
qtemporaryfile Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
qtextstream Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01: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 winrt: msvc2015: refactor file handling 2016-01-21 05:53:17 +00:00