diff options
Diffstat (limited to 'src/quick/util/qquickstyledtext.cpp')
-rw-r--r-- | src/quick/util/qquickstyledtext.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp index 7d545cdb2f..660852ba83 100644 --- a/src/quick/util/qquickstyledtext.cpp +++ b/src/quick/util/qquickstyledtext.cpp @@ -89,8 +89,8 @@ public: QQmlContext *context, bool preloadImages, bool *fontSizeModified) - : text(t), layout(l), imgTags(&imgTags), baseFont(layout.font()), baseUrl(baseUrl), hasNewLine(true), nbImages(0), updateImagePositions(false) - , preFormat(false), prependSpace(false), hasSpace(true), preloadImages(preloadImages), fontSizeModified(fontSizeModified), context(context) + : text(t), layout(l), imgTags(&imgTags), baseFont(layout.font()), baseUrl(baseUrl), + fontSizeModified(fontSizeModified), context(context), preloadImages(preloadImages) { } @@ -122,15 +122,15 @@ public: QFont baseFont; QStack<List> listStack; QUrl baseUrl; - bool hasNewLine; - int nbImages; - bool updateImagePositions; - bool preFormat; - bool prependSpace; - bool hasSpace; - bool preloadImages; bool *fontSizeModified; QQmlContext *context; + int nbImages = 0; + bool hasNewLine = true; + bool updateImagePositions = false; + bool preFormat = false; + bool prependSpace = false; + bool hasSpace = true; + bool preloadImages; static const QChar lessThan; static const QChar greaterThan; @@ -706,7 +706,7 @@ void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QStri // to avoid a relayout later on. QUrl url = baseUrl.resolved(image->url); if (url.isLocalFile()) { - image->pix = new QQuickPixmap(context->engine(), url, image->size); + image->pix = new QQuickPixmap(context->engine(), url, QRect(), image->size); if (image->pix && image->pix->isReady()) { image->size = image->pix->implicitSize(); } else { |