diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-06-05 11:50:25 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-06-05 14:19:18 +0200 |
commit | de867d237094b3ba7953aea68a739d13da056a76 (patch) | |
tree | 9d3384e37becefec0f51ed69c46fdf96b9d53a29 /src/imports/platform/qquickplatformsystemtrayicon.cpp | |
parent | e2565d8c18183f54cf41ad7b29e2f015ecde66f4 (diff) |
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 <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformsystemtrayicon.cpp')
-rw-r--r-- | src/imports/platform/qquickplatformsystemtrayicon.cpp | 42 |
1 files changed, 0 insertions, 42 deletions
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 @@ -253,48 +253,6 @@ void QQuickPlatformSystemTrayIcon::setVisible(bool visible) } /*! - \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 This property holds the tooltip of the system tray icon. |