qt5base-lts/tests/auto/other/qaccessibility
Liang Qi afab1546a7 Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
	qmake/doc/snippets/code/doc_src_qmake-manual.pro
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/tools/qbytearray.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST

Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c
2015-08-26 20:06:57 +02:00
..
.gitignore
accessiblewidgets.h Update copyright headers 2015-02-11 06:49:51 +00:00
qaccessibility.pro fix usage of wince scope 2015-06-05 10:29:10 +00:00
tst_qaccessibility.cpp Merge remote-tracking branch 'origin/5.5' into 5.6 2015-08-26 20:06:57 +02:00