summaryrefslogtreecommitdiffstats
path: root/examples/widgets/desktop/systray/window.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/widgets/desktop/systray/window.cpp')
-rw-r--r--examples/widgets/desktop/systray/window.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp
index 31fcd84821..e30166beac 100644
--- a/examples/widgets/desktop/systray/window.cpp
+++ b/examples/widgets/desktop/systray/window.cpp
@@ -160,9 +160,10 @@ void Window::iconActivated(QSystemTrayIcon::ActivationReason reason)
void Window::showMessage()
{
showIconCheckBox->setChecked(true);
- QSystemTrayIcon::MessageIcon msgIcon = QSystemTrayIcon::MessageIcon(
- typeComboBox->itemData(typeComboBox->currentIndex()).toInt());
- if (msgIcon == QSystemTrayIcon::NoIcon) {
+ int selectedIcon = typeComboBox->itemData(typeComboBox->currentIndex()).toInt();
+ QSystemTrayIcon::MessageIcon msgIcon = QSystemTrayIcon::MessageIcon(selectedIcon);
+
+ if (selectedIcon == -1) { // custom icon
QIcon icon(iconComboBox->itemIcon(iconComboBox->currentIndex()));
trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), icon,
durationSpinBox->value() * 1000);
@@ -222,7 +223,7 @@ void Window::createMessageGroupBox()
QStyle::SP_MessageBoxCritical), tr("Critical"),
QSystemTrayIcon::Critical);
typeComboBox->addItem(QIcon(), tr("Custom icon"),
- QSystemTrayIcon::NoIcon);
+ -1);
typeComboBox->setCurrentIndex(1);
durationLabel = new QLabel(tr("Duration:"));