summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-08-03 14:29:07 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-09 11:23:00 +0000
commit1284bb5c63028cd85e462c3ddf499091f0800112 (patch)
treefcca3787131ee09257723d24151cba42987b16a0
parent0cabb3d9fd6d8babcb61111fd8d48c43cc70f616 (diff)
Remove QFont deprecation warnings
QFont(QString) constructor has been depreceated in Qt 6.2 Change-Id: Id507f5291500629e7d35342f94ca1539b7a3e52d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 39b593f83bbd6caaab44e55b491a8f9802968f55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/statemachine/animation/sub-attaq/progressitem.cpp2
-rw-r--r--examples/statemachine/animation/sub-attaq/textinformationitem.cpp2
-rw-r--r--examples/statemachine/statemachine/rogue/window.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/statemachine/animation/sub-attaq/progressitem.cpp b/examples/statemachine/animation/sub-attaq/progressitem.cpp
index 350dbb7..cef79ff 100644
--- a/examples/statemachine/animation/sub-attaq/progressitem.cpp
+++ b/examples/statemachine/animation/sub-attaq/progressitem.cpp
@@ -55,7 +55,7 @@
ProgressItem::ProgressItem(QGraphicsItem *parent)
: QGraphicsTextItem(parent)
{
- setFont(QFont("Comic Sans MS"));
+ setFont(QFont(QStringList{"Comic Sans MS"}));
setPos(parentItem()->boundingRect().topRight() - QPointF(180, -5));
}
diff --git a/examples/statemachine/animation/sub-attaq/textinformationitem.cpp b/examples/statemachine/animation/sub-attaq/textinformationitem.cpp
index c79bcc2..a50d811 100644
--- a/examples/statemachine/animation/sub-attaq/textinformationitem.cpp
+++ b/examples/statemachine/animation/sub-attaq/textinformationitem.cpp
@@ -53,7 +53,7 @@
TextInformationItem::TextInformationItem (QGraphicsItem *parent)
: QGraphicsTextItem(parent)
{
- setFont(QFont("Comic Sans MS", 15));
+ setFont(QFont(QStringList{"Comic Sans MS"}, 15));
}
void TextInformationItem::setMessage(const QString &text, bool centerPosition)
diff --git a/examples/statemachine/statemachine/rogue/window.cpp b/examples/statemachine/statemachine/rogue/window.cpp
index 3e7cbf0..1b52691 100644
--- a/examples/statemachine/statemachine/rogue/window.cpp
+++ b/examples/statemachine/statemachine/rogue/window.cpp
@@ -63,12 +63,12 @@ Window::Window()
QFont font;
const QStringList families = QFontDatabase::families();
if (families.contains("Monospace")) {
- font = QFont("Monospace");
+ font = QFont(QStringList{"Monospace"});
}
else {
for (const QString &family : families) {
if (QFontDatabase::isFixedPitch(family)) {
- font = QFont(family);
+ font = QFont(QStringList{family});
break;
}
}