AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6755ec891a
qt5base-lts/tests/auto/gui/text
History
Liang Qi 6755ec891a Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	configure
	qmake/Makefile.unix.macos
	qmake/Makefile.unix.win32
	qmake/generators/win32/msvc_vcproj.cpp
	src/3rdparty/pcre/qt_attribution.json
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qdeadlinetimer.cpp
	src/platformsupport/kmsconvenience/qkmsdevice.cpp
	src/platformsupport/kmsconvenience/qkmsdevice_p.h
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
	tests/manual/qstorageinfo/printvolumes.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
2016-12-13 09:39:20 +01:00
..
qabstracttextdocumentlayout Make imageAt and formatAt more robus against different font metrics 2016-08-12 03:59:23 +00:00
qcssparser Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qfont UIKit: Improve handling of private system fonts / fallback fonts 2016-12-08 16:38:01 +00:00
qfontcache Avoid synthesizing stretch on condensed font families 2016-08-15 11:39:44 +00:00
qfontdatabase Register fonts with preferred names on Windows 2016-11-23 10:04:47 +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
qinputcontrol Accept ZWNJ, ZWJ and PUA characters in input widgets 2016-12-12 11:13:53 +00:00
qrawfont Added capHeight() to QRawFont and QFontMetrics(F) 2016-08-15 18:27:06 +00:00
qstatictext Fix some warnings in tests 2016-11-28 13:10:43 +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 Add QTextDocument::toRawText() function 2016-10-17 07:29:10 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01: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 Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +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 update testdata 2016-08-31 10:00:29 +00:00
text.pro Accept ZWNJ, ZWJ and PUA characters in input widgets 2016-12-12 11:13:53 +00:00