diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-15 01:00:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-15 01:00:11 +0100 |
| commit | 8264e495fa9220c101a8a913701a0b8834a6d58b (patch) | |
| tree | 069aa1d3efab926991c1edfc5b69a3d9e58dcfba /src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | |
| parent | 80f52812f2651e6d427bb3dd2e338b60fb25d48b (diff) | |
| parent | 8eb3944dac81b8c51d7bac7784204d457551b50c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8b5a10d897a926078895ae41f48cdbd2474902b8
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index 85d213ad46..bbaaf43ebb 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -507,6 +507,8 @@ static void addExtraFallbacks(QStringList *fallbackList) // add Apple Symbols to cover those too. if (!fallbackList->contains(QStringLiteral("Apple Symbols"))) fallbackList->append(QStringLiteral("Apple Symbols")); +#else + Q_UNUSED(fallbackList) #endif } |