Liang Qi 7533156b68 Merge remote-tracking branch 'origin/5.11' into 5.12 ... Conflicts: src/gui/text/qtextengine.cpp tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc		2018-08-22 10:35:12 +02:00
..
.gitignore
accessiblewidgets.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qaccessibility.pro	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
tst_qaccessibility.cpp	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-08-22 10:35:12 +02:00