305dd1b61f
Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e |
||
---|---|---|
.. | ||
qabstracttextdocumentlayout | ||
qcssparser | ||
qfont | ||
qfontcache | ||
qfontdatabase | ||
qfontmetrics | ||
qglyphrun | ||
qinputcontrol | ||
qrawfont | ||
qstatictext | ||
qsyntaxhighlighter | ||
qtextblock | ||
qtextcursor | ||
qtextdocument | ||
qtextdocumentfragment | ||
qtextdocumentlayout | ||
qtextformat | ||
qtextlayout | ||
qtextlist | ||
qtextobject | ||
qtextodfwriter | ||
qtextpiecetable | ||
qtextscriptengine | ||
qtexttable | ||
qzip | ||
text.pro |