Skip to content

Commit

Permalink
[qt6web] register custom root scheme already when load library
Browse files Browse the repository at this point in the history
Same as in qt5web, reference on that object may be preserved
in the qt classes
  • Loading branch information
linev committed Aug 16, 2023
1 parent d4b3fe7 commit 13afb29
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions gui/qt6webdisplay/rootqt6.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <QWebEngineView>
#include <qtwebenginecoreglobal.h>
#include <QWebEngineDownloadRequest>
// #include <qtwebenginequickglobal.h>

#include <QThread>
#include <QWebEngineSettings>
Expand All @@ -40,6 +39,9 @@
#include <ROOT/RWebDisplayHandle.hxx>
#include <ROOT/RLogger.hxx>

QWebEngineUrlScheme gRootScheme("rootscheme");


/** \class TQt6Timer
\ingroup qt6webdisplay
*/
Expand Down Expand Up @@ -101,12 +103,6 @@ class RQt6WebDisplayHandle : public RWebDisplayHandle {
// initialize web engine only before creating QApplication
// QtWebEngineQuick::initialize();

QWebEngineUrlScheme scheme("rootscheme");
scheme.setSyntax(QWebEngineUrlScheme::Syntax::HostAndPort);
scheme.setDefaultPort(2345);
scheme.setFlags(QWebEngineUrlScheme::SecureScheme);
QWebEngineUrlScheme::registerScheme(scheme);

qargv[0] = gApplication->Argv(0);
qargv[1] = nullptr;

Expand Down Expand Up @@ -246,7 +242,16 @@ class RQt6WebDisplayHandle : public RWebDisplayHandle {
};

struct RQt6CreatorReg {
RQt6CreatorReg() { RQt6WebDisplayHandle::AddCreator(); }
RQt6CreatorReg()
{
RQt6WebDisplayHandle::AddCreator();

gRootScheme.setSyntax(QWebEngineUrlScheme::Syntax::HostAndPort);
gRootScheme.setDefaultPort(2345);
gRootScheme.setFlags(QWebEngineUrlScheme::SecureScheme);
QWebEngineUrlScheme::registerScheme(gRootScheme);

}
} newRQt6CreatorReg;

}
Expand Down

0 comments on commit 13afb29

Please sign in to comment.