Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +01:00
..
.gitignore	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
accessiblewidgets.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qaccessibility.pro	Accessibility: Improve line boundary helper functions	2014-09-04 14:50:32 +02:00
tst_qaccessibility.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00