diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-28 08:57:29 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-28 09:58:56 +0000 |
| commit | 6c8693a55a4c02a4a4bb820b20c02d194889b6e3 (patch) | |
| tree | c16f0d4f1882eab8ff51dba97282078db644bbe1 | |
| parent | 1dc00d8cd23ccd1eaa9463c5c5da3adbf3ed0709 (diff) | |
Fix deprecation warnings about QFont(QString)
Adapt to qtbase/d8602ce58b6ef268be84b9aa0166b0c3fa6a96e8 and
qtbase/111115bf8862b7cd1197c2ef8a4b475c882776d4, fixing:
qttools/src/pixeltool/qpixeltool.cpp:232:37: warning: QFont::QFont(const QString&, int, int, bool) is deprecated: Pass QStringList{family} or family.split(QLatin1Char(',')) instead of family [-Wdeprecated-declarations]
qttools/src/linguist/linguist/printout.cpp:40:35: warning: QFont::QFont(const QString&, int, int, bool) is deprecated: Pass QStringList{family} or family.split(QLatin1Char(',')) instead of family [-Wdeprecated-declarations]
Change-Id: Ib2a365c24e39962b357443f67b316a58d412e94b
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
(cherry picked from commit 8aea8e8eb197415696248a6460d5dd741fd0a62d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/linguist/linguist/printout.cpp | 2 | ||||
| -rw-r--r-- | src/pixeltool/qpixeltool.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/linguist/linguist/printout.cpp b/src/linguist/linguist/printout.cpp index 471aab6df..e80407ecc 100644 --- a/src/linguist/linguist/printout.cpp +++ b/src/linguist/linguist/printout.cpp @@ -37,7 +37,7 @@ PrintOut::PrintOut(QPrinter *printer) : pr(printer), nextRule(NoRule), page(0) { p.begin(pr); - QFont f(QLatin1String("Arial")); + QFont f(QStringList{u"Arial"_qs}); f8 = f; f8.setPointSize(8); f10 = f; diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp index 745fd5933..868f3707b 100644 --- a/src/pixeltool/qpixeltool.cpp +++ b/src/pixeltool/qpixeltool.cpp @@ -229,8 +229,7 @@ void QPixelTool::paintEvent(QPaintEvent *) } } - QFont f(QLatin1String("courier")); - f.setBold(true); + QFont f(QStringList{u"courier"_qs}, -1, QFont::Bold); p.setFont(f); if (m_displayZoom) { |