From 0cb45e6527cc6a36747c391f940cbf82da6a21ba Mon Sep 17 00:00:00 2001 From: tux3 Date: Wed, 25 Feb 2015 17:48:43 +0100 Subject: [PATCH] Disable systray unity backend by default It's confusing too many people, lacks some features, and is only useful on Unity --- INSTALL.md | 6 +++--- qtox.pro | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7376820d4..a6eccef92 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -63,18 +63,18 @@ The following steps assumes that you cloned the repository at "/home/user/qTox". Arch Linux: ```bash -sudo pacman -S --needed base-devel qt5 opencv openal libxss libappindicator-devel +sudo pacman -S --needed base-devel qt5 opencv openal libxss ``` Debian / Ubuntu: ```bash -sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libopencv-dev libxss-dev libappindicator-dev +sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libopencv-dev libxss-dev ``` Fedora: ```bash yum groupinstall "Development Tools" -yum install qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel openal-soft-devel libXScrnSaver-devel libappindicator-devel +yum install qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel openal-soft-devel libXScrnSaver-devel ``` Slackware: diff --git a/qtox.pro b/qtox.pro index 91edf83c7..1ebf15ffc 100644 --- a/qtox.pro +++ b/qtox.pro @@ -183,8 +183,7 @@ win32 { # The systray Unity backend implements the system tray icon on Unity (Ubuntu) and GNOME desktops. unix:!macx:!android { -contains(ENABLE_SYSTRAY_UNITY_BACKEND, NO) { -} else { +contains(ENABLE_SYSTRAY_UNITY_BACKEND, YES) { DEFINES += ENABLE_SYSTRAY_UNITY_BACKEND INCLUDEPATH += "/usr/include/libappindicator-0.1" @@ -202,7 +201,6 @@ contains(ENABLE_SYSTRAY_UNITY_BACKEND, NO) { LIBS += -lgobject-2.0 -lappindicator -lgtk-x11-2.0 } -} # The systray Status Notifier backend implements the system tray icon on KDE and compatible desktops unix:!macx:!android {