diff options
author | ckamm <mail@ckamm.de> | 2016-06-07 12:48:25 +0300 |
---|---|---|
committer | ckamm <mail@ckamm.de> | 2016-06-07 12:48:25 +0300 |
commit | 355a8a0a2770eee95d30242ed0a5b19f722aeab9 (patch) | |
tree | e89a705cfffeadefd6a26a07dc16ffb7a6838fbf /src | |
parent | ab050f9093052d21140b2ac6fccfa19ae9987eb6 (diff) |
Workaround for Ubuntu 16.04 tray issue #4944 (#4947)
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/accountsettings.cpp | 8 | ||||
-rw-r--r-- | src/gui/generalsettings.cpp | 8 | ||||
-rw-r--r-- | src/gui/generalsettings.h | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 727d3bdc9..151f7b876 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -159,7 +159,13 @@ void AccountSettings::createAccountToolbox() void AccountSettings::slotOpenAccountWizard() { - if (QSystemTrayIcon::isSystemTrayAvailable()) { + if ( +#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) + qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" + // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray + // (issue #4693, #4944) +#endif + || QSystemTrayIcon::isSystemTrayAvailable()) { topLevelWidget()->close(); } #ifdef Q_OS_MAC diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index d4d41c56c..6373da4c4 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -161,12 +161,4 @@ void GeneralSettings::slotIgnoreFilesEditor() } } -void GeneralSettings::slotOpenAccountWizard() -{ - if (QSystemTrayIcon::isSystemTrayAvailable()) { - topLevelWidget()->close(); - } - OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0); -} - } // namespace OCC diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h index 74c297f30..69c96c4a1 100644 --- a/src/gui/generalsettings.h +++ b/src/gui/generalsettings.h @@ -44,7 +44,6 @@ private slots: void slotToggleOptionalDesktopNotifications(bool); void slotUpdateInfo(); void slotIgnoreFilesEditor(); - void slotOpenAccountWizard(); private: void loadMiscSettings(); |