mirror of
https://github.com/crystalidea/qt6windows7.git
synced 2025-07-03 07:45:30 +08:00
6.5.3 clean
This commit is contained in:
@ -319,8 +319,8 @@ void tst_QFontDatabase::fallbackFonts()
|
||||
layout.createLine();
|
||||
layout.endLayout();
|
||||
|
||||
QList<QGlyphRun> runs = layout.glyphRuns(0, 1);
|
||||
foreach (QGlyphRun run, runs) {
|
||||
const QList<QGlyphRun> runs = layout.glyphRuns(0, 1);
|
||||
for (QGlyphRun run : runs) {
|
||||
QRawFont rawFont = run.rawFont();
|
||||
QVERIFY(rawFont.isValid());
|
||||
|
||||
|
@ -490,7 +490,7 @@ void tst_QRawFont::supportedWritingSystems_data()
|
||||
void tst_QRawFont::supportedWritingSystems()
|
||||
{
|
||||
QFETCH(QString, fileName);
|
||||
QFETCH(WritingSystemList, writingSystems);
|
||||
QFETCH(const WritingSystemList, writingSystems);
|
||||
QFETCH(QFont::HintingPreference, hintingPreference);
|
||||
|
||||
QRawFont font(fileName, 10, hintingPreference);
|
||||
@ -499,7 +499,7 @@ void tst_QRawFont::supportedWritingSystems()
|
||||
WritingSystemList actualWritingSystems = font.supportedWritingSystems();
|
||||
QCOMPARE(actualWritingSystems.size(), writingSystems.size());
|
||||
|
||||
foreach (QFontDatabase::WritingSystem writingSystem, writingSystems)
|
||||
for (QFontDatabase::WritingSystem writingSystem : writingSystems)
|
||||
QVERIFY(actualWritingSystems.contains(writingSystem));
|
||||
}
|
||||
|
||||
|
@ -15,7 +15,7 @@ qt_internal_add_test(tst_qstatictext
|
||||
## Scopes:
|
||||
#####################################################################
|
||||
|
||||
qt_internal_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
|
||||
qt_internal_extend_target(tst_qstatictext CONDITION QT_FEATURE_developer_build
|
||||
LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::GuiPrivate
|
||||
|
@ -1097,11 +1097,12 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675_data()
|
||||
|
||||
bool hasTests = false;
|
||||
|
||||
QStringList families;
|
||||
families << QStringLiteral("Monaco");
|
||||
families << QStringLiteral("DejaVu Sans Mono");
|
||||
const QString families[] = {
|
||||
QStringLiteral("Monaco"),
|
||||
QStringLiteral("DejaVu Sans Mono"),
|
||||
};
|
||||
|
||||
foreach (const QString &family, families) {
|
||||
for (const QString &family : families) {
|
||||
QFont font(family);
|
||||
font.setStyleStrategy(QFont::NoFontMerging);
|
||||
if (QFontInfo(font).family() != family)
|
||||
|
Reference in New Issue
Block a user