diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-11-24 18:11:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-04 00:16:08 +0100 |
| commit | 6709e2060aff8b792fcc57004222f7de72584831 (patch) | |
| tree | 0271306f0090660de24648f6261950e1a533e371 /src/quick/items/qquicktextedit.cpp | |
| parent | 3a9b01127054901293b177e538eb8cfa3937e9fe (diff) | |
QQuickTextDocumentWithImageResources: use QTextDocument::baseUrl
QTextDocument::baseUrl was introduced in qtbase commit 1f22c1d. The
ultimate goal is to get rid of QQuickTextDocumentWithImageResources
and eventually make QQuickTextEdit's document interchangeable.
Change-Id: Ibafeecc395b52f7200d8164f809bf76538e5620c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index ffc732621d..c342c79ce5 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -830,7 +830,7 @@ void QQuickTextEdit::setBaseUrl(const QUrl &url) if (baseUrl() != url) { d->baseUrl = url; - d->document->setBaseUrl(url, d->richText); + d->document->setBaseUrl(url); emit baseUrlChanged(); } } @@ -1281,7 +1281,7 @@ void QQuickTextEdit::componentComplete() Q_D(QQuickTextEdit); QQuickImplicitSizeItem::componentComplete(); - d->document->setBaseUrl(baseUrl(), d->richText); + d->document->setBaseUrl(baseUrl()); #ifndef QT_NO_TEXTHTML_PARSER if (d->richText) d->control->setHtml(d->text); |