mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 21:46:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

fixup: remove outdated Qt5.5 workaround code

Browse source
This commit is contained in:
Christian Kamm 2018-06-18 09:50:11 +02:00 committed by Camila San
parent 14df7a3273
commit ce3339a00f
No known key found for this signature in database
GPG key ID: 7A4A6121E88E2AD4
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui/owncloudgui.cpp
View file

@ -533,30 +533,6 @@ void ownCloudGui::setupContextMenu()
return; return;
} }
bool qdbusmenuWorkarounds = false;
// Enables workarounds for bugs introduced in Qt 5.5.0
// In particular QTBUG-47863 #3672 (tray menu fails to update and
// becomes unresponsive) and QTBUG-48068 #3722 (click signal is
// emitted several times)
// The Qt version check intentionally uses 5.0.0 (where platformMenu()
// was introduced) instead of 5.5.0 to avoid issues where the Qt
// version used to build is different from the one used at runtime.
// If we build with 5.6.1 or newer, we can skip this because the
// bugs should be fixed there.
#ifdef Q_OS_LINUX
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) && (QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
if (qVersion() == QByteArray("5.5.0")) {
QObject *platformMenu = reinterpret_cast<QObject *>(_tray->contextMenu()->platformMenu());
if (platformMenu
&& platformMenu->metaObject()->className() == QLatin1String("QDBusPlatformMenu")) {
qdbusmenuWorkarounds = true;
qCWarning(lcApplication) << "Enabled QDBusPlatformMenu workaround";
}
}
#endif
#endif
auto applyEnvVariable = [](bool *sw, const QByteArray &value) { auto applyEnvVariable = [](bool *sw, const QByteArray &value) {
if (value == "1") if (value == "1")
*sw = true; *sw = true;
@ -564,6 +540,8 @@ void ownCloudGui::setupContextMenu()
*sw = false; *sw = false;
}; };
// This is an old compound flag that people might still depend on
bool qdbusmenuWorkarounds = false;
applyEnvVariable(&qdbusmenuWorkarounds, envForceQDBusTrayWorkaround()); applyEnvVariable(&qdbusmenuWorkarounds, envForceQDBusTrayWorkaround());
if (qdbusmenuWorkarounds) { if (qdbusmenuWorkarounds) {
_workaroundFakeDoubleClick = true; _workaroundFakeDoubleClick = true;