qt6-bb10/tests/auto/gui/text
Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/dbus/qdbusconnection_p.h
	src/dbus/qdbusintegrator.cpp
	src/dbus/qdbusintegrator_p.h
	tests/auto/corelib/io/qdir/qdir.pro
	tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp

Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
2016-01-26 16:27:28 +01:00
..
qabstracttextdocumentlayout Remove insignificant from qabstracttextdocumentlayout test 2016-01-22 09:13:27 +00:00
qcssparser Updated license headers 2016-01-21 18:55:18 +00:00
qfont Updated license headers 2016-01-21 18:55:18 +00:00
qfontcache Updated license headers 2016-01-21 18:55:18 +00:00
qfontdatabase Updated license headers 2016-01-21 18:55:18 +00:00
qfontmetrics Updated license headers 2016-01-21 18:55:18 +00:00
qglyphrun Remove insignificant flag from qglyphrun test 2016-01-22 09:13:20 +00:00
qrawfont Updated license headers 2016-01-21 18:55:18 +00:00
qstatictext Updated license headers 2016-01-21 18:55:18 +00:00
qsyntaxhighlighter Updated license headers 2016-01-21 18:55:18 +00:00
qtextblock Updated license headers 2016-01-21 18:55:18 +00:00
qtextcursor Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qtextdocument Updated license headers 2016-01-21 18:55:18 +00:00
qtextdocumentfragment Updated license headers 2016-01-21 18:55:18 +00:00
qtextdocumentlayout Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
qtextformat Updated license headers 2016-01-21 18:55:18 +00:00
qtextlayout Updated license headers 2016-01-21 18:55:18 +00:00
qtextlist Updated license headers 2016-01-21 18:55:18 +00:00
qtextobject Updated license headers 2016-01-21 18:55:18 +00:00
qtextodfwriter Updated license headers 2016-01-21 18:55:18 +00:00
qtextpiecetable Updated license headers 2016-01-21 18:55:18 +00:00
qtextscriptengine Updated license headers 2016-01-21 18:55:18 +00:00
qtexttable Updated license headers 2016-01-21 18:55:18 +00:00
qzip Updated license headers 2016-01-21 18:55:18 +00:00
text.pro