Use KMenu for the kdenotification plugin if ENABLE_KNOTIFICATIONS isn't enabled

This commit is contained in:
codestation
2015-02-21 00:32:26 -04:30
parent be0f4b9b20
commit 99e8ca1002
5 changed files with 3 additions and 18 deletions

View File

@@ -18,7 +18,7 @@
*/
#include "kdenotifiertray.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#ifndef ENABLE_KNOTIFICATIONS
#include <kmenu.h>
#else
#include <QMenu>
@@ -45,7 +45,7 @@ void KDENotifierTray::init()
connect(about_qt, SIGNAL(triggered()), this, SIGNAL(showAboutQt()));
connect(quit, SIGNAL(triggered()), this, SIGNAL(stopServer()));
#if QT_VERSION < 0x050000
#ifndef ENABLE_KNOTIFICATIONS
KMenu *tray_icon_menu = new KMenu(this);
#else
QMenu *tray_icon_menu = new QMenu(this);

View File

@@ -47,14 +47,7 @@ private:
QAction *about;
QAction *about_qt;
#ifndef ENABLE_KDE_NOTIFIER
QSystemTrayIcon *m_tray_icon;
#else
KDENotifier *m_notifier_item;
#endif
public slots:
};
#endif // QTRAYICON_H