AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4fe2fbcf82
qt5base-lts/tests/auto/gui/text
History
Liang Qi 4fe2fbcf82 Merge remote-tracking branch 'origin/5.6' into 5.7 
This also reverts commit 018e670a26.

The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.

Conflicts:
	.qmake.conf
	src/corelib/io/qstandardpaths_mac.mm
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4
2016-02-18 20:50:35 +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 Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01: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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01: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 Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01: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 Fix the font engines leaking 2013-03-20 07:02:29 +01:00