Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
Code Issues Projects Releases Activity

Add QtWebEngineQuick::initialize again

Browse Source 
this is only because we still don't know for sure
what is wrong here.
This commit is contained in:
Elias Steurer 2023-07-29 11:21:05 +02:00
parent 5a7f6e85d3
commit 58782fb490
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ScreenPlayWallpaper/main.cpp
View File

@ -4,12 +4,13 @@
#include <QStringList> #include <QStringList>
#include <QVector> #include <QVector>
#include <QtGlobal> #include <QtGlobal>
#include <QtWebEngineQuick>
#include "ScreenPlayWallpaper/CMakeVariables.h"
#include "ScreenPlayUtil/exitcodes.h" #include "ScreenPlayUtil/exitcodes.h"
#include "ScreenPlayUtil/util.h" #include "ScreenPlayUtil/util.h"
#include "ScreenPlayWallpaper/CMakeVariables.h"
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#include "src/winwindow.h" #include "src/winwindow.h"
Q_IMPORT_QML_PLUGIN(ScreenPlaySysInfoPlugin) Q_IMPORT_QML_PLUGIN(ScreenPlaySysInfoPlugin)
@ -24,6 +25,9 @@ Q_IMPORT_QML_PLUGIN(ScreenPlayWeatherPlugin)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
// Lets keep using it until: https://bugreports.qt.io/browse/QTBUG-109401
QtWebEngineQuick::initialize();
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
// Workaround for Qt 6.5.1 crash https://bugreports.qt.io/browse/QTBUG-113832 // Workaround for Qt 6.5.1 crash https://bugreports.qt.io/browse/QTBUG-113832
qputenv("QT_DISABLE_HW_TEXTURES_CONVERSION", "1"); qputenv("QT_DISABLE_HW_TEXTURES_CONVERSION", "1");

6
ScreenPlayWidget/main.cpp
View File

@ -6,6 +6,7 @@
#include <QQmlExtensionPlugin> #include <QQmlExtensionPlugin>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QtWebEngineQuick>
#include "src/widgetwindow.h" #include "src/widgetwindow.h"
@ -21,7 +22,10 @@ Q_IMPORT_QML_PLUGIN(ScreenPlayWeatherPlugin)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
#if !defined(Q_OS_LINUX) // Lets keep using it until: https://bugreports.qt.io/browse/QTBUG-109401
QtWebEngineQuick::initialize();
#if defined(Q_OS_WIN)
qputenv("QT_MEDIA_BACKEND", "ffmpeg"); qputenv("QT_MEDIA_BACKEND", "ffmpeg");
#endif #endif