Liang Qi 1fadc7292b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/plugins/platforms/windows/qwindowsfontengine.cpp src/plugins/platforms/windows/qwindowsnativeimage.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7		2016-02-24 13:31:14 +01:00
..
android	Updated license headers	2016-01-21 18:55:18 +00:00
bic/data	bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64	2015-02-14 06:54:20 +00:00
cmake	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
compilerwarnings/data	Updated license headers	2016-01-21 18:55:18 +00:00
concurrent	QtConcurrentRun: add unittest for polling for isFinished()	2016-02-15 13:53:57 +00:00
corelib	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
dbus	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
gui	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-24 13:31:14 +01:00
guiapplauncher	Fix path to examples part of tst_GuiAppLauncher	2015-02-13 07:28:15 +00:00
installed_cmake	Add a unit test for testing Qt in its install location.	2013-07-02 23:08:54 +02:00
network	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 19:40:45 +00:00
opengl	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
other	Add native support for D-Bus global menu	2016-02-23 20:56:07 +00:00
printsupport	Updated license headers	2016-01-21 18:55:18 +00:00
shared	Updated license headers	2016-01-21 18:55:18 +00:00
sql	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
testlib	Make it possible to preserve the library/plugin path in tst_selftest	2016-02-23 21:16:44 +00:00
tools	uic: Accept an -idbased argument	2016-01-28 14:07:43 +00:00
widgets	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-24 13:31:14 +01:00
xml	Updated license headers	2016-01-21 18:55:18 +00:00
auto.pro	Autotests: if cross-compiling, ignore dbus status on compilation host	2016-02-23 12:19:31 +00:00
network-settings.h	Updated license headers	2016-01-21 18:55:18 +00:00
qtest-config.h	Updated license headers	2016-01-21 18:55:18 +00:00
test.pl	Updated license headers	2016-01-21 18:55:18 +00:00