diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-27 22:05:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 15:31:02 +0200 |
| commit | ac300a166f801a6f6c0b15278e6893720a5726f8 (patch) | |
| tree | 8fe61b473b8372d05f21fb457710267a8c95ec8c /tests | |
| parent | e563ca1a7512a48e4d3e205ac8807d61c070d3f7 (diff) | |
Load resources in in QTextDocument correctly
In Qt 4, we loaded resources through the QTextEdit or
QTextControl if they were the parent of the document.
Modularization for Qt 5 broke this, as we can't cast
the parent to a QTextEdit anymore.
The fix is to make the loadResource() methods in QTextControl
and QTextEdit invokable and discover and invoke them at
runtime on the parent object.
Task-number: QTBUG-25116
Change-Id: Iba04bc16849b0c5ddcd275f12d1a386a8fe591bf
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index c78989ebcb..8d4238b553 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -296,7 +296,6 @@ void tst_QTextBrowser::anchors() void tst_QTextBrowser::resourceAutoDetection() { browser->setHtml("<img src=\":/some/resource\"/>"); -QEXPECT_FAIL("", "FIXME: Resource detection broken", Continue); QCOMPARE(browser->lastResource.toString(), QString("qrc:/some/resource")); } @@ -451,8 +450,7 @@ void tst_QTextBrowser::sourceInsideLoadResource() { QUrl url = QUrl::fromLocalFile("pagewithimage.html"); browser->setSource(url); -QEXPECT_FAIL("", "FIXME: Resource detection broken", Continue); - QCOMPARE(browser->lastResource.toLocalFile(), QUrl::fromLocalFile(QDir::current().filePath("foobar.png")).toString()); + QCOMPARE(browser->lastResource, QUrl::fromLocalFile(QDir::current().filePath("foobar.png"))); QEXPECT_FAIL("", "This is currently not supported", Continue); QCOMPARE(browser->sourceInsideLoadResource.toString(), url.toString()); } |