From bb88ad6e8ca5344d94c3aef7e6d94c5fc719ab45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20V=C3=A4nttinen?= Date: Fri, 5 Nov 2021 05:02:02 +0200 Subject: [PATCH] Add Microsoft Edge support for Linux (#7100) --- src/browser/BrowserSettingsWidget.cpp | 6 ------ src/browser/NativeMessageInstaller.cpp | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/browser/BrowserSettingsWidget.cpp b/src/browser/BrowserSettingsWidget.cpp index 7aa3e3cd..d0f81615 100644 --- a/src/browser/BrowserSettingsWidget.cpp +++ b/src/browser/BrowserSettingsWidget.cpp @@ -139,12 +139,6 @@ void BrowserSettingsWidget::loadSettings() m_ui->snapWarningLabel->setVisible(false); #endif -// TODO: Enable Edge support when Linux version is released -#ifdef Q_OS_LINUX - m_ui->edgeSupport->setChecked(false); - m_ui->edgeSupport->setEnabled(false); -#endif - #ifdef KEEPASSXC_DIST_SNAP // Disable settings that will not work m_ui->useCustomProxy->setChecked(false); diff --git a/src/browser/NativeMessageInstaller.cpp b/src/browser/NativeMessageInstaller.cpp index 3e81c495..dbf6b9b3 100644 --- a/src/browser/NativeMessageInstaller.cpp +++ b/src/browser/NativeMessageInstaller.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2017 Sami Vänttinen - * Copyright (C) 2017 KeePassXC Team + * Copyright (C) 2021 KeePassXC Team * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -70,7 +70,7 @@ namespace const QString TARGET_DIR_TOR_BROWSER = QStringLiteral( "/torbrowser/tbb/x86_64/tor-browser_en-US/Browser/TorBrowser/Data/Browser/.mozilla/native-messaging-hosts"); const QString TARGET_DIR_BRAVE = QStringLiteral("/BraveSoftware/Brave-Browser/NativeMessagingHosts"); - const QString TARGET_DIR_EDGE = QStringLiteral("/microsoftedge/NativeMessagingHosts"); + const QString TARGET_DIR_EDGE = QStringLiteral("/microsoft-edge/NativeMessagingHosts"); #endif } // namespace