Merge pull request #7243 from thoys/20821

CR for Job #20821 - Remove stray tray icon
This commit is contained in:
Brad Hefta-Gaub 2016-03-03 18:10:56 -08:00
commit 5b2c3b4b26
2 changed files with 0 additions and 3 deletions

View file

@ -31,7 +31,6 @@ MainWindow::MainWindow(QWidget* parent) :
_windowState("WindowState", 0)
{
setAcceptDrops(true);
_trayIcon.show();
}
void MainWindow::restoreGeometry() {

View file

@ -13,7 +13,6 @@
#define __hifi__MainWindow__
#include <QMainWindow>
#include <QSystemTrayIcon>
#include <SettingHandle.h>
@ -43,7 +42,6 @@ protected:
private:
Setting::Handle<QRect> _windowGeometry;
Setting::Handle<int> _windowState;
QSystemTrayIcon _trayIcon;
};
#endif /* defined(__hifi__MainWindow__) */