From 5872d40008c7577e25071b25d9b165ac1f90fef2 Mon Sep 17 00:00:00 2001 From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Date: Tue, 29 Sep 2020 11:41:38 -0400 Subject: [PATCH] chatview: allow remote-debugging-port option to be set - also re-enables the disable-web-security flag Change-Id: Iabbae6bd78e30be91b42ea08541cb3ab3aea4045 --- src/main.cpp | 4 +++- src/mainapplication.cpp | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 20ca27dde..a92947ec1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,7 +66,9 @@ main(int argc, char* argv[]) Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor); QtWebEngine::initialize(); - MainApplication app(argc, argv); + char ARG_DISABLE_WEB_SECURITY[] = "--disable-web-security"; + auto newArgv = parseInputArgument(argc, argv, ARG_DISABLE_WEB_SECURITY); + MainApplication app(argc, newArgv); /* * Runguard to make sure that only one instance runs at a time. diff --git a/src/mainapplication.cpp b/src/mainapplication.cpp index bdb6676fe..654387d2d 100644 --- a/src/mainapplication.cpp +++ b/src/mainapplication.cpp @@ -257,6 +257,15 @@ MainApplication::parseArguments() parser.addHelpOption(); parser.addVersionOption(); + // This option is forced into the arg list. + QCommandLineOption webSecurityDisableOption(QStringList() << "disable-web-security"); + parser.addOption(webSecurityDisableOption); + + QCommandLineOption webDebugOption(QStringList() << "remote-debugging-port", + "Web debugging port.", + "port"); + parser.addOption(webDebugOption); + QCommandLineOption minimizedOption(QStringList() << "m" << "minimized", "Start minimized."); -- GitLab