2 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/widgets/charactermap/characterwidget.cpp b/examples/widgets/widgets/charactermap/characterwidget.cpp
index 55d45501f1..5bab921516 100644
--- a/examples/widgets/widgets/charactermap/characterwidget.cpp
+++ b/examples/widgets/widgets/charactermap/characterwidget.cpp
@@ -181,7 +181,7 @@ void CharacterWidget::paintEvent(QPaintEvent *event)
             if (key == lastKey)
                 painter.fillRect(column*squareSize + 1, row*squareSize + 1, squareSize, squareSize, QBrush(Qt::red));
 
-            painter.drawText(column*squareSize + (squareSize / 2) - fontMetrics.width(QChar(key))/2,
+            painter.drawText(column*squareSize + (squareSize / 2) - fontMetrics.horizontalAdvance(QChar(key))/2,
                              row*squareSize + 4 + fontMetrics.ascent(),
                              QString(QChar(key)));
         }
diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index 5f17128a2f..d3ac55483c 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -244,7 +244,7 @@ void MainWindow::updateClipboard()
 class FontInfoDialog : public QDialog
 {
 public:
-    explicit FontInfoDialog(QWidget *parent = Q_NULLPTR);
+    explicit FontInfoDialog(QWidget *parent = nullptr);
 
 private:
     QString text() const;