Skip to content

Commit 58a0d77

Browse files
committed
support/QtAwesome: Update to Font Awesome 7
Update bundled copies to Font-Awesome release 7.1.0. Related #35, #107, #114.
1 parent 6a1bf18 commit 58a0d77

8 files changed

Lines changed: 9 additions & 9 deletions

support/QtAwesome.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ class QtAwesomeIconPainterIconEngine : public QIconEngine {
224224

225225
//---------------------------------------------------------------------------------------
226226

227-
const QString QtAwesome::FA_BRANDS_FONT_FILENAME = "Font Awesome 6 Brands-Regular-400.otf";
228-
const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "Font Awesome 6 Free-Regular-400.otf";
229-
const QString QtAwesome::FA_SOLID_FONT_FILENAME = "Font Awesome 6 Free-Solid-900.otf";
227+
const QString QtAwesome::FA_BRANDS_FONT_FILENAME = "Font Awesome 7 Brands-Regular-400.otf";
228+
const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "Font Awesome 7 Free-Regular-400.otf";
229+
const QString QtAwesome::FA_SOLID_FONT_FILENAME = "Font Awesome 7 Free-Solid-900.otf";
230230
const QString QtAwesome::FA_BRANDS_FONT_STYLE = "Regular";
231231
const QString QtAwesome::FA_REGULAR_FONT_STYLE = "Regular";
232232
const QString QtAwesome::FA_SOLID_FONT_STYLE = "Solid";
@@ -247,9 +247,9 @@ QtAwesome::QtAwesome(QObject* parent)
247247
_fontDetails.insert(fa::fa_brands, QtAwesomeFontData(FA_BRANDS_FONT_FILENAME, FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
248248
#else
249249
// use "filename" to store font family name...
250-
_fontDetails.insert(fa::fa_solid, QtAwesomeFontData("Font Awesome 6 Free Solid", FA_SOLID_FONT_WEIGHT, FA_SOLID_FONT_STYLE));
251-
_fontDetails.insert(fa::fa_regular, QtAwesomeFontData("Font Awesome 6 Free Regular", FA_REGULAR_FONT_WEIGHT, FA_REGULAR_FONT_STYLE));
252-
_fontDetails.insert(fa::fa_brands, QtAwesomeFontData("Font Awesome 6 Brands Regular", FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
250+
_fontDetails.insert(fa::fa_solid, QtAwesomeFontData("Font Awesome 7 Free Solid", FA_SOLID_FONT_WEIGHT, FA_SOLID_FONT_STYLE));
251+
_fontDetails.insert(fa::fa_regular, QtAwesomeFontData("Font Awesome 7 Free Regular", FA_REGULAR_FONT_WEIGHT, FA_REGULAR_FONT_STYLE));
252+
_fontDetails.insert(fa::fa_brands, QtAwesomeFontData("Font Awesome 7 Brands Regular", FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
253253
#endif
254254

255255
#ifdef USE_COLOR_SCHEME

support/QtAwesomeFree.qrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file>fonts/Font Awesome 6 Brands-Regular-400.otf</file>
4-
<file>fonts/Font Awesome 6 Free-Regular-400.otf</file>
5-
<file>fonts/Font Awesome 6 Free-Solid-900.otf</file>
3+
<file>fonts/Font Awesome 7 Brands-Regular-400.otf</file>
4+
<file>fonts/Font Awesome 7 Free-Regular-400.otf</file>
5+
<file>fonts/Font Awesome 7 Free-Solid-900.otf</file>
66
</qresource>
77
</RCC>
-542 KB
Binary file not shown.
-186 KB
Binary file not shown.
-1000 KB
Binary file not shown.
195 KB
Binary file not shown.
85.3 KB
Binary file not shown.
401 KB
Binary file not shown.

0 commit comments

Comments
 (0)