Support maximumSize for the layout of the text in a QStaticText

Put back maximumSize property in QStaticText to allow matching calls
to drawText with a target rectangle. Implementation is done by
having a dummy paint engine which records the calls to drawTextItem()
and storing these, then replaying them later.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 50d27ac..1057893 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5729,13 +5729,9 @@ void QPainter::drawStaticText(const QPointF &position, const QStaticText &static
         return;
 
     const QStaticTextPrivate *staticText_d = QStaticTextPrivate::get(&staticText);
-
-    QFixed x = QFixed::fromReal(position.x());
     for (int i=0; i<staticText_d->itemCount; ++i) {
         const QTextItemInt &gf = staticText_d->items[i];
-        if (gf.num_chars != 0)
-            drawTextItem(QPointF(x.toReal(), position.y()), gf);
-        x += gf.width;
+        d->engine->drawTextItem(staticText_d->itemPositions[i] + position, gf);
     }
 }