AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a732576a66
qt5base-lts/tests/auto/gui/text
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +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 Save QFont's style name if present 2016-08-03 11:47:58 +00:00
qfontcache Avoid synthesizing stretch on condensed font families 2016-08-15 11:39:44 +00:00
qfontdatabase Make self-contained test of condensed font matching and width 2016-10-16 00:11:13 +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 Added capHeight() to QRawFont and QFontMetrics(F) 2016-08-15 18:27:06 +00:00
qstatictext Fix plain text QStaticText with line breaks 2016-10-04 14:30:13 +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.7' into 5.8 2016-09-22 07:28:34 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02: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 Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00