AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22f3800cac
qt5base-lts/tests/auto/gui/text
History
Liang Qi 56d6e000f7 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	mkspecs/wince80colibri-armv7-msvc2012/qmake.conf
	qmake/generators/win32/msvc_vcproj.cpp
	src/corelib/global/qnamespace.h
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qfsfileengine_win.cpp
	src/corelib/tools/tools.pri
	src/network/ssl/qsslconfiguration_p.h
	src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
	src/plugins/platforms/windows/windows.pri
	src/src.pro
	src/tools/bootstrap/bootstrap.pro
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/dialogs/qfilesystemmodel.cpp
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt

Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5
2016-05-23 21:09:46 +02:00
..
qabstracttextdocumentlayout Add QAbstractTextDocumentLayout::imageAt(), formatAt() 2016-03-18 19:02:13 +00:00
qcssparser QtGui: Remove Windows CE. 2016-03-30 17:35:41 +00:00
qfont Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
qfontcache Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
qfontdatabase QtGui: Remove Windows CE. 2016-03-30 17:35:41 +00:00
qfontmetrics Updated license headers 2016-01-21 18:55:18 +00:00
qglyphrun QtGui: Remove Windows CE. 2016-03-30 17:35:41 +00:00
qrawfont Updated license headers 2016-01-21 18:55:18 +00:00
qstatictext Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01: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.7' into dev 2016-05-12 08:33:08 +02: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 Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
qtexttable Updated license headers 2016-01-21 18:55:18 +00:00
qzip QtGui: Remove Windows CE. 2016-03-30 17:35:41 +00:00
text.pro Enable most of tst_qstatictext on non-developer builds 2016-03-10 15:45:41 +00:00