Liang Qi 56d6e000f7 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: mkspecs/wince80colibri-armv7-msvc2012/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/tools/tools.pri src/network/ssl/qsslconfiguration_p.h src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/plugins/platforms/windows/windows.pri src/src.pro src/tools/bootstrap/bootstrap.pro src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/dialogs/qfilesystemmodel.cpp tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5		2016-05-23 21:09:46 +02:00
..
collections	Updated license headers	2016-01-21 18:55:18 +00:00
qalgorithms	Updated license headers	2016-01-21 18:55:18 +00:00
qarraydata	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qarraydata_strictiterators
qbitarray	Updated license headers	2016-01-21 18:55:18 +00:00
qbytearray	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
qbytearraylist	Updated license headers	2016-01-21 18:55:18 +00:00
qbytearraymatcher	Updated license headers	2016-01-21 18:55:18 +00:00
qbytedatabuffer	Updated license headers	2016-01-21 18:55:18 +00:00
qcache	Updated license headers	2016-01-21 18:55:18 +00:00
qchar	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
qcollator	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qcommandlineparser	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
qcontiguouscache	Updated license headers	2016-01-21 18:55:18 +00:00
qcryptographichash	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qdate	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qdatetime	QtCore: Remove Windows CE.	2016-03-30 11:22:47 +00:00
qeasingcurve	Updated license headers	2016-01-21 18:55:18 +00:00
qelapsedtimer	Updated license headers	2016-01-21 18:55:18 +00:00
qexplicitlyshareddatapointer	Updated license headers	2016-01-21 18:55:18 +00:00
qfreelist	Updated license headers	2016-01-21 18:55:18 +00:00
qhash	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
qhash_strictiterators
qhashfunctions	Updated license headers	2016-01-21 18:55:18 +00:00
qlatin1string	QLatin1String: add at()/op[]/mid()/right()/left()	2016-02-19 18:16:38 +00:00
qline	Remove inclusion of -lm for INTEGRITY.	2016-03-18 20:40:59 +00:00
qlinkedlist	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qlist	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qlist_strictiterators
qlocale	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-11 09:12:36 +02:00
qmap	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qmap_strictiterators
qmargins	Updated license headers	2016-01-21 18:55:18 +00:00
qmessageauthenticationcode	Updated license headers	2016-01-21 18:55:18 +00:00
qpair	Updated license headers	2016-01-21 18:55:18 +00:00
qpoint	Updated license headers	2016-01-21 18:55:18 +00:00
qpointf	Updated license headers	2016-01-21 18:55:18 +00:00
qqueue	Updated license headers	2016-01-21 18:55:18 +00:00
qrect	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
qregexp	QtCore: Remove Windows CE.	2016-03-30 11:22:47 +00:00
qregularexpression	Updated license headers	2016-01-21 18:55:18 +00:00
qringbuffer	Updated license headers	2016-01-21 18:55:18 +00:00
qscopedpointer	Updated license headers	2016-01-21 18:55:18 +00:00
qscopedvaluerollback	Updated license headers	2016-01-21 18:55:18 +00:00
qset	Updated license headers	2016-01-21 18:55:18 +00:00
qsharedpointer	Make QSharedPointer without custom deleters call the correct destructor	2016-04-28 12:58:35 +00:00
qsize	Updated license headers	2016-01-21 18:55:18 +00:00
qsizef	Updated license headers	2016-01-21 18:55:18 +00:00
qstl	Updated license headers	2016-01-21 18:55:18 +00:00
qstring	Collate conversion functions for Core Foundation/Foundation types	2016-05-19 11:20:36 +00:00
qstring_no_cast_from_bytearray	Updated license headers	2016-01-21 18:55:18 +00:00
qstringapisymmetry	QChar: optimize comparison with QString{,Ref}	2016-04-05 19:47:37 +00:00
qstringbuilder	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-13 06:55:37 +02:00
qstringiterator	Updated license headers	2016-01-21 18:55:18 +00:00
qstringlist	QtCore: Remove Windows CE.	2016-03-30 11:22:47 +00:00
qstringmatcher	Updated license headers	2016-01-21 18:55:18 +00:00
qstringref	QStringRef: add missing {c,}r{begin,end}()	2016-04-07 11:29:45 +00:00
qtextboundaryfinder	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qtime	Updated license headers	2016-01-21 18:55:18 +00:00
qtimeline	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-12 08:33:08 +02:00
qtimezone	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
qvarlengtharray	Updated license headers	2016-01-21 18:55:18 +00:00
qvector	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qvector_strictiterators
qversionnumber	Add QLibraryInfo::version() returning the Qt version as QVersionNumber	2016-04-27 16:12:55 +00:00
tools.pro	Add test for API symmetry of QString/Ref, QLatin1String, QChar	2016-03-15 08:11:35 +00:00