AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
990969655c
qt5base-lts/src/gui/text
History
Liang Qi 990969655c Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	config_help.txt
	configure
	src/corelib/io/qprocess_wince.cpp
	src/plugins/platforms/windows/qwindowstheme.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp
	tests/auto/corelib/tools/qtimezone/BLACKLIST
	tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
2016-05-12 08:33:08 +02:00
..
qabstracttextdocumentlayout_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qabstracttextdocumentlayout.cpp Add QAbstractTextDocumentLayout::imageAt(), formatAt() 2016-03-18 19:02:13 +00:00
qabstracttextdocumentlayout.h Merge remote-tracking branch 'origin/5.7' into dev 2016-03-22 07:28:42 +01:00
qcssparser_p.h Interpret fixed CSS line-height as minimum rather than absolute 2016-04-19 09:32:10 +00:00
qcssparser.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
qcssscanner.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdistancefield_p.h Add environment variable QT_DISTANCEFIELD 2016-03-11 10:44:19 +00:00
qdistancefield.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00
qfont_p.h Merge remote-tracking branch 'origin/5.6' into dev 2016-01-21 08:17:21 +01:00
qfont.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
qfont.h Updated license headers 2016-01-15 12:25:24 +00:00
qfontdatabase.cpp Fix font fallback for an overridden Common script cases 2016-04-27 00:40:02 +00:00
qfontdatabase.h Fix font fallback for an overridden Common script cases 2016-04-27 00:40:02 +00:00
qfontengine_ft_p.h Support color font rendering for freetype engine 2016-05-03 22:58:49 +00:00
qfontengine_ft.cpp Support color font rendering for freetype engine 2016-05-03 22:58:49 +00:00
qfontengine_p.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
qfontengine_qpf2_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qfontengine_qpf2.cpp QtGui: use printf-style qWarning/qDebug where possible (I) 2016-03-04 10:29:08 +00:00
qfontengine.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
qfontengineglyphcache_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qfontengineglyphcache.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qfontinfo.h Updated license headers 2016-01-15 12:25:24 +00:00
qfontmetrics.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qfontmetrics.h Updated license headers 2016-01-15 12:25:24 +00:00
qfontsubset_agl.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qfontsubset_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qfontsubset.cpp QtGui: use printf-style qWarning/qDebug where possible (I) 2016-03-04 10:29:08 +00:00
qfragmentmap_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qfragmentmap.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qglyphrun_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qglyphrun.cpp Use QFlags::setFlag where prudent in qtbase 2016-02-12 19:32:05 +00:00
qglyphrun.h Updated license headers 2016-01-15 12:25:24 +00:00
qharfbuzzng_p.h Disable ligatures using existing mechanism in HB, not workaround 2016-02-24 09:01:29 +00:00
qharfbuzzng.cpp QFontEngine: use RAII for font_, face_ members 2016-03-04 10:37:25 +00:00
qplatformfontdatabase.cpp QtGui: use printf-style qWarning/qDebug where possible (I) 2016-03-04 10:29:08 +00:00
qplatformfontdatabase.h Updated license headers 2016-01-15 12:25:24 +00:00
qrawfont_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qrawfont.cpp Fix font fallback for an overridden Common script cases 2016-04-27 00:40:02 +00:00
qrawfont.h Updated license headers 2016-01-15 12:25:24 +00:00
qstatictext_p.h QtGui: mark some more types as movable/primitive 2016-03-03 16:22:27 +00:00
qstatictext.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qstatictext.h Updated license headers 2016-01-15 12:25:24 +00:00
qsyntaxhighlighter.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qsyntaxhighlighter.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextcursor_p.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qtextcursor.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qtextcursor.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qtextdocument_p.cpp Fix QTextEdit/QQuickTextEdit undo bug - Part #2 2016-03-02 16:00:02 +00:00
qtextdocument_p.h gui: Pass large types by const-ref 2016-03-15 21:25:59 +00:00
qtextdocument.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-05-12 08:33:08 +02:00
qtextdocument.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextdocumentfragment_p.h QtGui: mark some more types as movable/primitive 2016-03-03 16:22:27 +00:00
qtextdocumentfragment.cpp QtGui: eradicate Q_FOREACH loops [const-& returns] 2016-02-11 23:18:44 +00:00
qtextdocumentfragment.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextdocumentlayout_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextdocumentlayout.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-04-11 09:12:36 +02:00
qtextdocumentwriter.cpp QtGui: Introduce delegating constructors. 2016-05-09 19:47:53 +00:00
qtextdocumentwriter.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextengine_p.h QtGui: mark more types as primitive/movable 2016-04-25 07:43:27 +00:00
qtextengine.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-04-11 09:12:36 +02:00
qtextformat_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextformat.cpp QtGui: mark some more types as movable/primitive 2016-03-03 16:22:27 +00:00
qtextformat.h QtGui: mark some more types as movable/primitive 2016-03-03 16:22:27 +00:00
qtexthtmlparser_p.h Interpret fixed CSS line-height as minimum rather than absolute 2016-04-19 09:32:10 +00:00
qtexthtmlparser.cpp Interpret fixed CSS line-height as minimum rather than absolute 2016-04-19 09:32:10 +00:00
qtextimagehandler_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextimagehandler.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtextlayout.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-05-03 15:49:15 +02:00
qtextlayout.h QtGui: mark some more types as movable/primitive 2016-03-03 16:22:27 +00:00
qtextlist.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtextlist.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextobject_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextobject.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qtextobject.h QTextFrame::iterator: restore nothrow move special members 2016-02-12 18:29:54 +00:00
qtextodfwriter_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtextodfwriter.cpp Add some QChar::unicode() calls to brush over deprecation warning. 2016-05-06 08:11:19 +00:00
qtextoption.cpp Add flag for showing document terminator in text 2016-04-08 12:30:42 +00:00
qtextoption.h Add flag for showing document terminator in text 2016-04-08 12:30:42 +00:00
qtexttable_p.h Replace some QList<int> with QVector<int> 2016-02-08 19:58:01 +00:00
qtexttable.cpp Replace some QList<int> with QVector<int> 2016-02-08 19:58:01 +00:00
qtexttable.h Updated license headers 2016-01-15 12:25:24 +00:00
qzip.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
qzipreader_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qzipwriter_p.h Updated license headers 2016-01-15 12:25:24 +00:00
text.pri src/gui/text/text.pri: add missing header qabstracttextdocumentlayout_p.h 2015-06-01 05:22:05 +00:00