Skip to content

support/QtAwesome: Update to Font Awesome 7 #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tgurr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

support/QtAwesome: Update to Font Awesome 7 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions support/QtAwesome.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ class QtAwesomeIconPainterIconEngine : public QIconEngine {

//---------------------------------------------------------------------------------------

const QString QtAwesome::FA_BRANDS_FONT_FILENAME = "Font Awesome 6 Brands-Regular-400.otf";
const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "Font Awesome 6 Free-Regular-400.otf";
const QString QtAwesome::FA_SOLID_FONT_FILENAME = "Font Awesome 6 Free-Solid-900.otf";
const QString QtAwesome::FA_BRANDS_FONT_FILENAME = "Font Awesome 7 Brands-Regular-400.otf";
const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "Font Awesome 7 Free-Regular-400.otf";
const QString QtAwesome::FA_SOLID_FONT_FILENAME = "Font Awesome 7 Free-Solid-900.otf";
const QString QtAwesome::FA_BRANDS_FONT_STYLE = "Regular";
const QString QtAwesome::FA_REGULAR_FONT_STYLE = "Regular";
const QString QtAwesome::FA_SOLID_FONT_STYLE = "Solid";
Expand All @@ -247,9 +247,9 @@ QtAwesome::QtAwesome(QObject* parent)
_fontDetails.insert(fa::fa_brands, QtAwesomeFontData(FA_BRANDS_FONT_FILENAME, FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
#else
// use "filename" to store font family name...
_fontDetails.insert(fa::fa_solid, QtAwesomeFontData("Font Awesome 6 Free Solid", FA_SOLID_FONT_WEIGHT, FA_SOLID_FONT_STYLE));
_fontDetails.insert(fa::fa_regular, QtAwesomeFontData("Font Awesome 6 Free Regular", FA_REGULAR_FONT_WEIGHT, FA_REGULAR_FONT_STYLE));
_fontDetails.insert(fa::fa_brands, QtAwesomeFontData("Font Awesome 6 Brands Regular", FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
_fontDetails.insert(fa::fa_solid, QtAwesomeFontData("Font Awesome 7 Free Solid", FA_SOLID_FONT_WEIGHT, FA_SOLID_FONT_STYLE));
_fontDetails.insert(fa::fa_regular, QtAwesomeFontData("Font Awesome 7 Free Regular", FA_REGULAR_FONT_WEIGHT, FA_REGULAR_FONT_STYLE));
_fontDetails.insert(fa::fa_brands, QtAwesomeFontData("Font Awesome 7 Brands Regular", FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
#endif

#ifdef USE_COLOR_SCHEME
Expand Down
Loading