X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=1510e025f738dd618ad83576a952b1aede5ed783;hp=56139e32201fe5d04b555be1e1a1e046566170a7;hb=f9116672c22abbb19817eb2ff7d93272927515f7;hpb=84cd3561e97167ffb98ecab0fd2b884ba1d13ada diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp index 56139e32..1510e025 100644 --- a/src/qtui/legacysystemtray.cpp +++ b/src/qtui/legacysystemtray.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This file is free software; you can redistribute it and/or modify * @@ -29,7 +29,7 @@ LegacySystemTray::LegacySystemTray(QWidget *parent) _blinkState(false), _lastMessageId(0) { -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 _trayIcon = new QSystemTrayIcon(associatedWidget()); #else _trayIcon = new KSystemTrayIcon(associatedWidget()); @@ -142,7 +142,7 @@ void LegacySystemTray::setState(State state_) } -Icon LegacySystemTray::stateIcon() const +QIcon LegacySystemTray::stateIcon() const { if (mode() == Legacy && state() == NeedsAttention && !_blinkState) return SystemTray::stateIcon(Active);