Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/dbus/qdbusconnection_p.h src/dbus/qdbusintegrator.cpp src/dbus/qdbusintegrator_p.h tests/auto/corelib/io/qdir/qdir.pro tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc		2016-01-26 16:27:28 +01:00
..
image	Updated license headers	2016-01-21 18:55:18 +00:00
itemmodels	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Updated license headers	2016-01-21 18:55:18 +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 dev	2016-01-26 16:27:28 +01: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