diff options
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r-- | tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index e4e9d12fb4..c9e71d8388 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -40,7 +40,6 @@ #include <qmessagebox.h> #include <qfontmetrics.h> #include <qmath.h> -#include <qtextdocumentresourceprovider.h> #include <private/qlabel_p.h> class Widget : public QWidget @@ -599,27 +598,22 @@ void tst_QLabel::taskQTBUG_48157_dprMovie() QCOMPARE(label.sizeHint(), movie.currentPixmap().size() / movie.currentPixmap().devicePixelRatio()); } -class UrlResourceProvider : public QTextDocumentResourceProvider -{ -public: - QVariant resource(const QUrl &url) override - { - resourseUrl = url; - return QVariant(); - } - - QUrl resourseUrl; -}; - void tst_QLabel::resourceProvider() { QLabel label; - UrlResourceProvider resourceProvider; - label.setResourceProvider(&resourceProvider); - QUrl url("test://img"); + int providerCalled = 0; + QUrl providerUrl; + label.setResourceProvider([&](const QUrl &url){ + providerUrl = url; + ++providerCalled; + return QVariant(); + }); + + const QUrl url("test://img"); label.setText(QStringLiteral("<img src='%1'/>").arg(url.toString())); label.show(); - QCOMPARE(url, resourceProvider.resourseUrl); + QCOMPARE(providerUrl, url); + QVERIFY(providerCalled > 0); } QTEST_MAIN(tst_QLabel) |