1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index fe1fb06..0bca8f7 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -924,8 +924,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
     \brief The QPainter class performs low-level painting on widgets and
     other paint devices.
 
-    \ingroup multimedia
-    \mainclass
+    \ingroup painting
+
     \reentrant
 
     QPainter provides highly optimized functions to do most of the
@@ -7501,8 +7501,8 @@ void qt_format_text(const QFont &fnt, const QRectF &_r,
     QFontMetricsF fm(fnt);
     QString text = str;
     int offset = 0;
-start_lenghtVariant:
-    bool hasMoreLenghtVariants = false;
+start_lengthVariant:
+    bool hasMoreLengthVariants = false;
     // compatible behaviour to the old implementation. Replace
     // tabs by spaces
     bool has_tab = false;
@@ -7524,7 +7524,7 @@ start_lenghtVariant:
             has_tab = true;
         } else if (chr == QChar(ushort(0x9c))) {
             // string with multiple length variants
-            hasMoreLenghtVariants = true;
+            hasMoreLengthVariants = true;
             break;
         }
     }
@@ -7648,9 +7648,9 @@ start_lenghtVariant:
     }
     QRectF bounds = QRectF(r.x() + xoff, r.y() + yoff, width, height);
 
-    if (hasMoreLenghtVariants && !(tf & Qt::TextLongestVariant) && !r.contains(bounds)) {
+    if (hasMoreLengthVariants && !(tf & Qt::TextLongestVariant) && !r.contains(bounds)) {
         offset++;
-        goto start_lenghtVariant;
+        goto start_lengthVariant;
     }
     if (brect)
         *brect = bounds;