diff options
| author | Andreas Hartmetz <andreas.hartmetz@kdab.com> | 2016-01-14 00:14:12 +0100 |
|---|---|---|
| committer | Andreas Hartmetz <andreas.hartmetz@kdab.com> | 2016-01-26 13:07:40 +0000 |
| commit | a6875f4409bf575c1590fcaf295f9cacc9bdc0c5 (patch) | |
| tree | a56725fdb64cd45969f70120865a21bb45cb5bc6 /src/quick/items/qquicktext.cpp | |
| parent | 16eaec15e8878c4edaadeada6d3a42aa0bf1bc96 (diff) | |
Preparations for re-rendering native text on DPI scaling changes.
This makes only non-functional changes so the next patch can make
mostly functional changes.
QQuickText: rename q_imageLoaded() to q_updateLayout().
Says what it does, not when it is called.
QQuickWindow: split QQuickWindow::forcePolish() into
QQuickWindow::handleScreenChanged() and
QQuickWindowPrivate::forcePolish().
Change-Id: Ief2ae30cd9f27ee8083b2c75765fb5278bde5ea8
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 5c436d2074..3aec464958 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -224,7 +224,7 @@ void QQuickTextPrivate::setBottomPadding(qreal value, bool reset) The default is true. */ -void QQuickText::q_imagesLoaded() +void QQuickText::q_updateLayout() { Q_D(QQuickText); d->updateLayout(); @@ -1170,7 +1170,7 @@ void QQuickTextPrivate::ensureDoc() extra->doc->setDocumentMargin(0); extra->doc->setBaseUrl(q->baseUrl()); qmlobject_connect(extra->doc, QQuickTextDocumentWithImageResources, SIGNAL(imagesLoaded()), - q, QQuickText, SLOT(q_imagesLoaded())); + q, QQuickText, SLOT(q_updateLayout())); } } |