Liang Qi f8246099ea Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/corelib/io/qstorageinfo_unix.cpp src/plugins/platforms/windows/qwindowsmousehandler.cpp src/widgets/styles/qwindowsvistastyle.cpp Change-Id: Ie1725933815891cc8c86258d4c0e8ed0ab386edf		2015-11-04 12:28:48 +01:00
..
accessibility	Android: Delay initialization of Accessibility.	2015-06-09 09:06:39 +00:00
jar	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-11-04 12:28:48 +01:00
java	Android: Add opt-in high-dpi support	2015-10-26 09:27:54 +00:00
templates	Android: Add opt-in high-dpi support	2015-10-26 09:27:54 +00:00
android.pro	Do not initialize accessibility code by default on startup.	2014-12-09 16:59:03 +01:00