Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
accessibility	Android: Delay initialization of Accessibility.	2015-06-09 09:06:39 +00:00
jar	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
java	Merge remote-tracking branch 'origin/5.4' into merge5.5	2015-05-08 13:26:44 +02:00
templates	Android: Fix resuming app after locale change	2015-06-02 07:28:43 +00:00
android.pro	Do not initialize accessibility code by default on startup.	2014-12-09 16:59:03 +01:00