Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ add_subdirectory(services)
if (BLUETOOTH)
add_subdirectory(bluetooth)
endif()

add_subdirectory(webengine)
9 changes: 8 additions & 1 deletion src/launch/launch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "../core/plugin.hpp"
#include "../core/rootwrapper.hpp"
#include "../ipc/ipc.hpp"
#include "../webengine/webengine.hpp"
#include "build.hpp"
#include "launch_p.hpp"

Expand Down Expand Up @@ -74,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;
Expand All @@ -91,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);
Expand Down Expand Up @@ -222,7 +225,11 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
delete coreApplication;

QGuiApplication* app = nullptr;
auto qArgC = 0;
auto qArgC = 1;

if (pragmas.useQtWebEngineQuick) {
web_engine::init();
}

if (pragmas.useQApplication) {
app = new QApplication(qArgC, argv);
Expand Down
3 changes: 3 additions & 0 deletions src/webengine/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
if (BUILD_TESTING)
add_subdirectory(test)
endif()
3 changes: 3 additions & 0 deletions src/webengine/test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
add_executable(webengine webengine.cpp)
target_link_libraries(webengine PRIVATE Qt::Core Qt::Test)
add_test(NAME webengine WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMAND $<TARGET_FILE:webengine>)
10 changes: 10 additions & 0 deletions src/webengine/test/webengine.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#include "webengine.hpp"

#include <qtest.h>
#include <qtestcase.h>

#include "../webengine.hpp"

void WebEngineInitTest::init() { QVERIFY(qs::web_engine::init()); }

QTEST_MAIN(WebEngineInitTest)
8 changes: 8 additions & 0 deletions src/webengine/test/webengine.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include <qobject.h>

class WebEngineInitTest: public QObject {
Q_OBJECT

private slots:
static void init();
};
54 changes: 54 additions & 0 deletions src/webengine/webengine.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#include <QDebug>
#include <qdebug.h>
#include <qlibrary.h>
#include <qlogging.h>

namespace qs::web_engine {

inline void printNotLoaded() {
qWarning() << "QtWebEngineQuick is not Loaded. Using the qml type WebEngineView from "
"QtWebEngine might lead to undefined behaviour!";
}

inline bool 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.";
printNotLoaded();
return false;
}

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";

printNotLoaded();
return false;
}

qDebug() << "Found symbol QtWebEngineQuick::initialize(). Initializing WebEngine...";

try {
initialize();
qDebug() << "Successfully initialized QtWebEngineQuick";
} catch (const std::exception& e) {
qWarning() << "Exception while calling QtWebEngineQuick::initialize()" << e.what();
printNotLoaded();
return false;
} catch (...) {
qWarning() << "Unknown Exception while calling QtWebEngineQuick::initialize()";
printNotLoaded();
return false;
}

return true;
}

} // namespace qs::web_engine
Loading