summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/util/qsystemtrayicon.cpp2
-rw-r--r--src/widgets/util/qsystemtrayicon.h2
-rw-r--r--src/widgets/util/qsystemtrayicon_p.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index 343a3c115b..9e667b1781 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -391,7 +391,7 @@ void QSystemTrayIcon::showMessage(const QString& title, const QString& msg,
d->showMessage_sys(title, msg, icon, msecs);
}
-void QSystemTrayIconPrivate::emitActivated(QPlatformSystemTrayIcon::ActivationReason reason)
+void QSystemTrayIconPrivate::_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason reason)
{
Q_Q(QSystemTrayIcon);
emit q->activated(static_cast<QSystemTrayIcon::ActivationReason>(reason));
diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h
index ee640b2f78..870081ef3e 100644
--- a/src/widgets/util/qsystemtrayicon.h
+++ b/src/widgets/util/qsystemtrayicon.h
@@ -118,7 +118,7 @@ private:
Q_DISABLE_COPY(QSystemTrayIcon)
Q_DECLARE_PRIVATE(QSystemTrayIcon)
- Q_PRIVATE_SLOT(d_func(), void emitActivated(QPlatformSystemTrayIcon::ActivationReason))
+ Q_PRIVATE_SLOT(d_func(), void _q_emitActivated(QPlatformSystemTrayIcon::ActivationReason))
friend class QSystemTrayIconSys;
friend class QBalloonTip;
diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h
index 3ab2ebc100..6650b4ce6b 100644
--- a/src/widgets/util/qsystemtrayicon_p.h
+++ b/src/widgets/util/qsystemtrayicon_p.h
@@ -90,7 +90,7 @@ public:
static bool isSystemTrayAvailable_sys();
static bool supportsMessages_sys();
- void emitActivated(QPlatformSystemTrayIcon::ActivationReason reason);
+ void _q_emitActivated(QPlatformSystemTrayIcon::ActivationReason reason);
QPointer<QMenu> menu;
QIcon icon;