Removed compile options for webengine support. Added pragma for loading Qt6WebEngineQuick at runtime

Author: just-some-entity

CMakeLists.txt

@@ -129,10 +129,6 @@ if (DBUS)
 	list(APPEND QT_FPDEPS DBus)
 endif()
 
-if (WEBVIEW)
-	list(APPEND QT_FPDEPS WebView)
-endif()
-
 find_package(Qt6 REQUIRED COMPONENTS ${QT_FPDEPS})
 
 # In Qt 6.10, private dependencies are required to be explicit,

src/launch/CMakeLists.txt

@@ -11,11 +11,6 @@ target_link_libraries(quickshell-launch PRIVATE
 	Qt::Quick Qt::Widgets CLI11::CLI11 quickshell-build
 )
 
-if(WEBVIEW)
-    add_compile_definitions(WEBVIEW_ENABLED)
-    target_link_libraries(quickshell-launch PRIVATE Qt::WebView)
-endif()
-
 qs_add_pchset(launch
 	DEPENDENCIES Qt::Core CLI11::CLI11
 	HEADERS

src/launch/launch.cpp

@@ -17,17 +17,14 @@
 #include <qtextstream.h>
 #include <unistd.h>
 
-#ifdef WEBVIEW_ENABLED
-#include <QtWebView>
-#endif
-
 #include "../core/common.hpp"
 #include "../core/instanceinfo.hpp"
 #include "../core/logging.hpp"
 #include "../core/paths.hpp"
 #include "../core/plugin.hpp"
 #include "../core/rootwrapper.hpp"
 #include "../ipc/ipc.hpp"
+#include "../webengine/webengine.hpp"
 #include "build.hpp"
 #include "launch_p.hpp"
 
@@ -78,6 +75,7 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 		bool nativeTextRendering = false;
 		bool desktopSettingsAware = true;
 		bool useSystemStyle = false;
+		bool useQtWebEngineQuick = false;
 		QString iconTheme = qEnvironmentVariable("QS_ICON_THEME");
 		QHash<QString, QString> envOverrides;
 		QString dataDir;
@@ -95,6 +93,7 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 			else if (pragma == "NativeTextRendering") pragmas.nativeTextRendering = true;
 			else if (pragma == "IgnoreSystemSettings") pragmas.desktopSettingsAware = false;
 			else if (pragma == "RespectSystemStyle") pragmas.useSystemStyle = true;
+			else if (pragma == "EnableQtWebEngineQuick") pragmas.useQtWebEngineQuick = true;
 			else if (pragma.startsWith("IconTheme ")) pragmas.iconTheme = pragma.sliced(10);
 			else if (pragma.startsWith("Env ")) {
 				auto envPragma = pragma.sliced(4);
@@ -228,11 +227,9 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 	QGuiApplication* app = nullptr;
 	auto qArgC = 1;
 
-#ifdef WEBVIEW_ENABLED
-	if (qEnvironmentVariable("QS_WEBVIEW", "0") == "1") {
-		QtWebView::initialize();
+	if(pragmas.useQtWebEngineQuick) {
+		web_engine::init();
 	}
-#endif
 
 	if (pragmas.useQApplication) {
 		app = new QApplication(qArgC, argv);

src/webengine/webengine.hpp

@@ -0,0 +1,39 @@
+#include <QDebug>
+#include <qdebug.h>
+#include <qlibrary.h>
+#include <qlogging.h>
+
+namespace qs::web_engine {
+
+inline void init() 
+{
+	using InitializeFunc = void (*)();
+
+	QLibrary lib("Qt6WebEngineQuick");
+	if (!lib.load()) {
+		qWarning() << "Failed to load library:" << lib.errorString();
+		qWarning() << "You might need to install the necessary package for Qt6WebEngineQuick.";
+		qWarning() << "QtWebEngineQuick is not Loaded. Using the qml type WebEngineView from "
+		              "QtWebEngine might lead to undefined behaviour!";
+		return;
+	}
+
+	qDebug() << "Loaded library Qt6WebEngineQuick";
+
+	auto initialize = reinterpret_cast<InitializeFunc>(lib.resolve("_ZN16QtWebEngineQuick10initializeEv"));
+	if (!initialize) {
+		qWarning() << "Failed to resolve symbol 'void QtWebEngineQuick::initialize()' in lib "
+		              "Qt6WebEngineQuick. This should not happen";
+		qWarning() << "QtWebEngineQuick is not Loaded. Using the qml type WebEngineView from "
+		              "QtWebEngine might lead to undefined behaviour!";
+		return;
+	}
+
+	qDebug() << "Found symbol QtWebEngineQuick::initialize(). Initializing WebEngine...";
+
+	initialize();
+
+	qDebug() << "Successfully initialized QtWebEngineQuick";
+}
+
+} // namespace qs::web_engine