Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 04:02:50 +01:00
Code Issues Projects Releases Activity

Update to Qt 6.5.1

Browse Source 
This removed the QWebEngine workaround and fixes ffmpeg looping,
but introduces ffmpeg crash.
This commit is contained in:
Elias Steurer 2023-05-25 15:14:16 +02:00
parent 844215db5e
commit 9b8b8e0374
7 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@ -6,7 +6,7 @@
"version": "0.2.0",
"configurations": [
{
"name": "Launch Qt 6.5.0",
"name": "Launch Qt 6.5.1",
"type": "cppvsdbg",
"request": "launch",
"program": "${command:cmake.launchTargetPath}",
@ -17,7 +17,7 @@
"environment": [
{
"name": "Path",
"value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.5.0\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.5.0\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.5.0\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
"value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.5.1\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.5.1\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.5.1\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
}
],
"visualizerFile": "${workspaceFolder}/.vscode/qt.natvis.xml",

32
CMakePresets.json
View File

@ -19,7 +19,7 @@
},
"environment" : {
"qt_path": "${sourceDir}/../aqt",
"qt_version": "6.5.0"
"qt_version": "6.5.1"
},
"toolset": {
"value": "host=x64",
@ -38,36 +38,36 @@
}
},
{
"name": "windows-debug-qt-6.5.0",
"name": "windows-debug-qt-6.5.1",
"inherits": "default-windows",
"displayName": "MSVC SP Qt 6.5.0 Debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_MSVC_Debug",
"displayName": "MSVC SP Qt 6.5.1 Debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.1_MSVC_Debug",
"environment": {
"qt_version": "6.5.0"
"qt_version": "6.5.1"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "windows-relwithdebinfo-qt-6.5.0",
"name": "windows-relwithdebinfo-qt-6.5.1",
"inherits": "default-windows",
"displayName": "MSVC SP Qt 6.5.0 RelWithDebInfo",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_MSVC_RelWithDebInfo",
"displayName": "MSVC SP Qt 6.5.1 RelWithDebInfo",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.1_MSVC_RelWithDebInfo",
"environment": {
"qt_version": "6.5.0"
"qt_version": "6.5.1"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "windows-release-qt-6.5.0",
"name": "windows-release-qt-6.5.1",
"inherits": "default-windows",
"displayName": "MSVC SP Qt 6.5.0 Release",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_MSVC_Release",
"displayName": "MSVC SP Qt 6.5.1 Release",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.1_MSVC_Release",
"environment": {
"qt_version": "6.5.0"
"qt_version": "6.5.1"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
@ -114,7 +114,7 @@
"displayName": "ScreenPlay 64bit Debug osx",
"description": "Osx only!",
"generator": "Ninja",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_Clang_Debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.1_Clang_Debug",
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
@ -131,7 +131,7 @@
"CMAKE_CXX_COMPILER": "clang++",
"CMAKE_C_COMPILER": "clang",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.5.0/macos",
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.5.1/macos",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
}
},
@ -139,7 +139,7 @@
"name": "osx-relwithdebinfo",
"displayName": "ScreenPlay 64bit RelWithDebInfo osx",
"inherits": "osx-debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.0_Clang_RelWithDebInfo",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.1_Clang_RelWithDebInfo",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}

14
ScreenPlayWallpaper/main.cpp
View File

@ -4,7 +4,6 @@
#include <QStringList>
#include <QVector>
#include <QtGlobal>
#include <QtWebEngineQuick>
#include "ScreenPlayUtil/exitcodes.h"
#include "ScreenPlayUtil/util.h"
@ -26,16 +25,9 @@ int main(int argc, char* argv[])
{
#if defined(Q_OS_WIN)
qputenv("QT_MEDIA_BACKEND", "windows"); // Workaround for Qt 6.5 looping lag bug https://bugreports.qt.io/browse/QTBUG-111209
qputenv("QT_MEDIA_BACKEND", "windows"); // Workaround for Qt 6.5.1 crash https://bugreports.qt.io/browse/QTBUG-113832
#endif
#if defined(Q_OS_OSX)
qputenv("QT_MEDIA_BACKEND", "ffmpeg");
#endif
QGuiApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
QtWebEngineQuick::initialize();
QGuiApplication app(argc, argv);
#if defined(Q_OS_WIN)
@ -54,13 +46,13 @@ int main(int argc, char* argv[])
if (argumentList.length() == 1) {
QString exampleContentPath = QString(SCREENPLAY_SOURCE_DIR) + "/Content";
QStringList contentFolder = {
"/wallpaper_landscape",
"/wallpaper_video_nebula",
"/wallpaper_landscape",
"/wallpaper_particles"
};
QString projectPath = exampleContentPath + contentFolder.at(0);
window.setActiveScreensList({ 1 });
window.setActiveScreensList({ 0 });
window.setProjectPath(projectPath);
window.setAppID("test");
window.setVolume(1);

6
ScreenPlayWallpaper/qml/MultimediaView.qml
View File

@ -40,12 +40,6 @@ Item {
fadeInDone = true
Wallpaper.requestFadeIn();
}
// Qt 6.5 workaround
// https://bugreports.qt.io/browse/QTBUG-111209
if (mediaPlayer.playbackState == MediaPlayer.StoppedState) {
if(root.loops)
mediaPlayer.play();
}
}
loops: root.loops ? MediaPlayer.Infinite : 1
videoOutput: vo

5
ScreenPlayWidget/main.cpp
View File

@ -4,8 +4,7 @@
#include <QQmlApplicationEngine>
#include <QString>
#include <QStringList>
#include <QtWebEngineQuick>
#include <QQmlExtensionPlugin>
#include "ScreenPlayWidget/CMakeVariables.h"
#include "src/widgetwindow.h"
@ -26,8 +25,6 @@ int main(int argc, char* argv[])
qputenv("QT_MEDIA_BACKEND", "ffmpeg");
#endif
QGuiApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
QtWebEngineQuick::initialize();
QGuiApplication app(argc, argv);

2
Tools/defines.py
View File

@ -20,7 +20,7 @@ elif sys.platform == "linux":
SCREENPLAY_VERSION = "0.15.0-RC6"
QT_PATH = path = Path(os.path.join(os.path.realpath(__file__), "../../../aqt")).resolve()
QT_VERSION = "6.5.0"
QT_VERSION = "6.5.1"
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
QT_IFW_VERSION = "4.5"

2
Tools/setup.py
View File

@ -50,7 +50,7 @@ def download(aqt_path: Path, qt_platform: Path):
elif system() == "Linux":
os = "linux"
# python -m aqt list-qt windows desktop --modules 6.5.0 win64_msvc2019_64
# python -m aqt list-qt windows desktop --modules 6.5.1 win64_msvc2019_64
qt_packages = "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning"
print(f"Downloading: {qt_packages} to {aqt_path}")
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O {aqt_path} {os} desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")