diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2020-11-27 16:22:07 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2020-11-27 16:34:45 +0800 |
| commit | d74d3191f93cac78aec4da072fdf68fe0ecdb040 (patch) | |
| tree | f1047cc49eea78cd0d311df3a026077b008c17f0 | |
| parent | 806743c93a8e2205b09f59c03202f8b1ccca4029 (diff) | |
Fix deprecation warning
Use QMetaType instead of QVariant to silence
deprecation warnings.
Change-Id: I6628db7215601b1bd14915a5db970fa86e9234a6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/imports/winextras/qquicktaskbarbutton.cpp | 2 | ||||
| -rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar.cpp | 4 | ||||
| -rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbutton.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/winextras/qquicktaskbarbutton.cpp b/src/imports/winextras/qquicktaskbarbutton.cpp index 688ef35..7d46006 100644 --- a/src/imports/winextras/qquicktaskbarbutton.cpp +++ b/src/imports/winextras/qquicktaskbarbutton.cpp @@ -93,7 +93,7 @@ void QQuickTaskbarOverlay::setIconSource(const QUrl &iconSource) return; } - if (QQuickIconLoader::load(iconSource, qmlEngine(parent()), QVariant::Icon, QSize(), + if (QQuickIconLoader::load(iconSource, qmlEngine(parent()), QMetaType::QIcon, QSize(), this, &QQuickTaskbarOverlay::iconLoaded) != QQuickIconLoader::LoadError) { m_iconSource = iconSource; emit iconSourceChanged(); diff --git a/src/imports/winextras/qquickthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp index ae706a5..6c7aa1e 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp @@ -179,7 +179,7 @@ void QQuickThumbnailToolBar::setIconicThumbnailSource(const QUrl &source) emit iconicThumbnailSourceChanged(); } - if (QQuickIconLoader::load(source, qmlEngine(this), QVariant::Pixmap, QSize(), + if (QQuickIconLoader::load(source, qmlEngine(this), QMetaType::QPixmap, QSize(), this, &QQuickThumbnailToolBar::iconicThumbnailLoaded) != QQuickIconLoader::LoadError) { m_iconicThumbnailSource = source; emit iconicThumbnailSourceChanged(); @@ -208,7 +208,7 @@ void QQuickThumbnailToolBar::setIconicLivePreviewSource(const QUrl &source) emit iconicLivePreviewSourceChanged(); } - if (QQuickIconLoader::load(source, qmlEngine(this), QVariant::Pixmap, QSize(), + if (QQuickIconLoader::load(source, qmlEngine(this), QMetaType::QPixmap, QSize(), this, &QQuickThumbnailToolBar::iconicLivePreviewLoaded) != QQuickIconLoader::LoadError) { m_iconicLivePreviewSource = source; emit iconicLivePreviewSourceChanged(); diff --git a/src/imports/winextras/qquickthumbnailtoolbutton.cpp b/src/imports/winextras/qquickthumbnailtoolbutton.cpp index e4a1f81..d0bbf55 100644 --- a/src/imports/winextras/qquickthumbnailtoolbutton.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbutton.cpp @@ -85,7 +85,7 @@ void QQuickThumbnailToolButton::setIconSource(const QUrl &iconSource) emit iconSourceChanged(); } - if (QQuickIconLoader::load(iconSource, qmlEngine(this), QVariant::Icon, QSize(), + if (QQuickIconLoader::load(iconSource, qmlEngine(this), QMetaType::QIcon, QSize(), this, &QQuickThumbnailToolButton::iconLoaded) != QQuickIconLoader::LoadError) { m_iconSource = iconSource; emit iconSourceChanged(); |