1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge remote-tracking branch 'zetok/tray'

This commit is contained in:
agilob 2015-10-23 18:49:49 +01:00
commit 49aca4fcdc
No known key found for this signature in database
GPG Key ID: 296F0B764741106C

View File

@ -88,16 +88,9 @@ SystemTrayIcon::SystemTrayIcon()
g_signal_connect(gtkIcon, "button-release-event", G_CALLBACK(callbackButtonClick), this);
}
#endif
else if (desktop == "kde" && getenv("KDE_SESSION_VERSION") == QStringLiteral("5"))
{
qDebug() << "Using the Qt backend on KDE5";
qtIcon = new QSystemTrayIcon;
backendType = SystrayBackendType::Qt;
connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated);
}
else
{
qDebug() << "Using the Qt backend, because nothing else matches";
qDebug() << "Using the Qt backend";
qtIcon = new QSystemTrayIcon;
backendType = SystrayBackendType::Qt;
connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated);