diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/widgets/qlabel.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qlabel.h | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qlabel_p.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 189a7488d3..d2f176c67d 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -1429,7 +1429,7 @@ void QLabel::setTextFormat(Qt::TextFormat format) Returns the resource provider for rich text of this label. */ -QUrlResourceProvider *QLabel::resourceProvider() const +QTextDocumentResourceProvider *QLabel::resourceProvider() const { Q_D(const QLabel); return d->control ? d->control->document()->resourceProvider() : d->resourceProvider; @@ -1442,7 +1442,7 @@ QUrlResourceProvider *QLabel::resourceProvider() const \note The label \e{does not} take ownership of the \a provider. */ -void QLabel::setResourceProvider(QUrlResourceProvider *provider) +void QLabel::setResourceProvider(QTextDocumentResourceProvider *provider) { Q_D(QLabel); d->resourceProvider = provider; diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 69aea6d57a..1b6e946476 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -49,7 +49,7 @@ QT_REQUIRE_CONFIG(label); QT_BEGIN_NAMESPACE -class QUrlResourceProvider; +class QTextDocumentResourceProvider; class QLabelPrivate; class Q_WIDGETS_EXPORT QLabel : public QFrame @@ -93,8 +93,8 @@ public: Qt::TextFormat textFormat() const; void setTextFormat(Qt::TextFormat); - QUrlResourceProvider *resourceProvider() const; - void setResourceProvider(QUrlResourceProvider *provider); + QTextDocumentResourceProvider *resourceProvider() const; + void setResourceProvider(QTextDocumentResourceProvider *provider); Qt::Alignment alignment() const; void setAlignment(Qt::Alignment); diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h index 80243239d2..635042a8cd 100644 --- a/src/widgets/widgets/qlabel_p.h +++ b/src/widgets/widgets/qlabel_p.h @@ -154,7 +154,7 @@ public: #endif uint openExternalLinks : 1; // <-- space for more bit field values here - QUrlResourceProvider *resourceProvider; + QTextDocumentResourceProvider *resourceProvider; friend class QMessageBoxPrivate; }; |