Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: .qmake.conf config.tests/unix/nis/nis.cpp mkspecs/unsupported/freebsd-g++/qplatformdefs.h src/corelib/tools/qdatetime.cpp src/corelib/tools/qsimd.cpp src/corelib/tools/qsimd_p.h src/network/access/access.pri src/network/access/qnetworkreplynsurlconnectionimpl.mm src/network/access/qnetworkreplynsurlconnectionimpl_p.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/printsupport/windows/qwindowsprintdevice.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp tests/auto/network/access/qnetworkreply/BLACKLIST tests/auto/widgets/widgets/qopenglwidget/BLACKLIST Change-Id: I4b32055bbf922392ef0264fd403405416fffee57		2016-06-06 09:04:55 +02:00
..
image	Fix compilation without process support	2016-05-20 10:37:18 +00:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qopengl	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
qopenglconfig	Updated license headers	2016-01-21 18:55:18 +00:00
text	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
util	Updated license headers	2016-01-21 18:55:18 +00:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00