From de867d237094b3ba7953aea68a739d13da056a76 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 5 Jun 2020 11:50:25 +0200 Subject: Platform: remove deprecated iconName, iconSource API [ChangeLog][Platform][Menu] The deprecated iconName and iconSource properties were removed. Use the icon property instead. [ChangeLog][Platform][MenuItem] The deprecated iconName and iconSource properties were removed. Use the icon property instead. [ChangeLog][Platform][SystemTrayIcon] The deprecated iconName and iconSource properties were removed. Use the icon property instead. Task-number: QTBUG-84715 Change-Id: I91a8ceb1a291b78fc342756de24e18b818a49b4b Reviewed-by: Shawn Rutledge --- .../platform/qquickplatformsystemtrayicon.cpp | 42 ---------------------- 1 file changed, 42 deletions(-) (limited to 'src/imports/platform/qquickplatformsystemtrayicon.cpp') diff --git a/src/imports/platform/qquickplatformsystemtrayicon.cpp b/src/imports/platform/qquickplatformsystemtrayicon.cpp index 4a96b38f..1631e449 100644 --- a/src/imports/platform/qquickplatformsystemtrayicon.cpp +++ b/src/imports/platform/qquickplatformsystemtrayicon.cpp @@ -252,48 +252,6 @@ void QQuickPlatformSystemTrayIcon::setVisible(bool visible) emit visibleChanged(); } -/*! - \qmlproperty url Qt.labs.platform::SystemTrayIcon::iconSource - \deprecated Use icon.source instead. - \sa icon -*/ -QUrl QQuickPlatformSystemTrayIcon::iconSource() const -{ - return icon().source(); -} - -void QQuickPlatformSystemTrayIcon::setIconSource(const QUrl& source) -{ - QQuickPlatformIcon newIcon = icon(); - if (source == newIcon.source()) - return; - - newIcon.setSource(source); - iconLoader()->setIcon(newIcon); - emit iconSourceChanged(); -} - -/*! - \qmlproperty string Qt.labs.platform::SystemTrayIcon::iconName - \deprecated Use icon.name instead. - \sa icon -*/ -QString QQuickPlatformSystemTrayIcon::iconName() const -{ - return icon().name(); -} - -void QQuickPlatformSystemTrayIcon::setIconName(const QString& name) -{ - QQuickPlatformIcon newIcon = icon(); - if (name == newIcon.name()) - return; - - newIcon.setName(name); - iconLoader()->setIcon(newIcon); - emit iconNameChanged(); -} - /*! \qmlproperty string Qt.labs.platform::SystemTrayIcon::tooltip -- cgit v1.2.3