diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 15:28:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-20 08:06:53 +0000 |
| commit | a27c3913c9888b8bb0ca909573d43a015d6f0631 (patch) | |
| tree | 0f805f27efc0e3231d9b37f0a71e4f5ce70cfb43 /src/imports/platform/qquickplatformiconloader.cpp | |
| parent | b16f0030f348965a81698063b7f8a0a82de5a1e6 (diff) | |
Platform: add icon.mask
[ChangeLog][Platform][Menu] Added icon.mask grouped property.
[ChangeLog][Platform][MenuItem] Added icon.mask grouped property.
[ChangeLog][Platform][SystemTrayIcon] Added icon.mask grouped property.
Task-number: QTBUG-67730
Change-Id: Idf8031b39038fb6b6774ebd2a2dcb32297465a40
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformiconloader.cpp')
| -rw-r--r-- | src/imports/platform/qquickplatformiconloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/platform/qquickplatformiconloader.cpp b/src/imports/platform/qquickplatformiconloader.cpp index 6d4d486e..c7b699b2 100644 --- a/src/imports/platform/qquickplatformiconloader.cpp +++ b/src/imports/platform/qquickplatformiconloader.cpp @@ -65,7 +65,9 @@ void QQuickPlatformIconLoader::setEnabled(bool enabled) QIcon QQuickPlatformIconLoader::toQIcon() const { QIcon fallback = QPixmap::fromImage(image()); - return QIcon::fromTheme(m_icon.name(), fallback); + QIcon icon = QIcon::fromTheme(m_icon.name(), fallback); + icon.setIsMask(m_icon.isMask()); + return icon; } QQuickPlatformIcon QQuickPlatformIconLoader::icon() const |