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

Add Qt 6.5 looping workaround

Browse Source 
Remove Qt6Widgets workaround

Update to latest vcpkg
Update to latest plausible-qml
Update to latest QArchive
This commit is contained in:
Elias Steurer 2023-02-16 13:06:50 +01:00
parent 20287fc11a
commit db9d319388
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"recommendations": [
"sanaajani.taskrunnercode"
]
}

4
CMake/FetchContentThirdParty.cmake
View File

@ -7,7 +7,7 @@ set(THIRD_PARTY_PATH "${CMAKE_SOURCE_DIR}/ThirdParty/")
FetchContent_Populate(
QArchive
GIT_REPOSITORY https://github.com/antony-jr/QArchive.git
GIT_TAG 2d05e652ad9a2bff8c87962d5525e2b3c4d7351b
GIT_TAG e587f30507c0e6d92f79a2dc1a6aa7ebb1f8e679
# Workaround because:
# 1. QtCreator cannot handle QML_ELEMENT stuff when it is in bin folder
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
@ -18,7 +18,7 @@ FetchContent_Populate(
FetchContent_Populate(
qml-plausible
GIT_REPOSITORY https://gitlab.com/kelteseth/qml-plausible.git
GIT_TAG 00398446c7a2882a11d34c007a1ed8205c72e123
GIT_TAG 5069ba3bf25663ea06be8b94c398d6c61058d4d5
# Workaround because:
# 1. QtCreator cannot handle QML_ELEMENT stuff when it is in bin folder
# https://bugreports.qt.io/browse/QTCREATORBUG-27083

2
ScreenPlay/CMakeLists.txt
View File

@ -346,7 +346,7 @@ if(WIN32
endif()
if(WIN32)
target_link_libraries(ScreenPlayApp PUBLIC sentry::sentry)
target_link_libraries(ScreenPlayApp PUBLIC CURL::libcurl sentry::sentry)
# Icon
target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc)

6
ScreenPlayWallpaper/qml/MultimediaView.qml
View File

@ -38,6 +38,12 @@ Item {
if (mediaPlayer.playbackState == MediaPlayer.PlayingState) {
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

8
Tools/build.py
View File

@ -353,14 +353,6 @@ def package(build_config: BuildConfig):
print(file, build_config.bin_dir)
shutil.copy2(file, build_config.bin_dir)
# ⚠️WORKAROUND. REMOVE ME WHEN FIXED:
# https://bugreports.qt.io/browse/QTBUG-110937
qt_bin_path = defines.QT_BIN_PATH
qt6Widgets_path = Path(qt_bin_path).joinpath("Qt6Widgets.dll").resolve()
print(f"⚠️WORKAROUND: Copy Qt6Widgets.dll from: {qt6Widgets_path}")
shutil.copy2(qt6Widgets_path, build_config.bin_dir)
if not platform.system() == "Darwin":
file_endings = [".ninja_deps", ".ninja", ".ninja_log", ".lib", ".a", ".exp",
".manifest", ".cmake", ".cbp", "CMakeCache.txt"]

2
Tools/defines.py
View File

@ -24,6 +24,6 @@ QT_VERSION = "6.5.0"
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
QT_IFW_VERSION = "4.5"
VCPKG_VERSION = "2871ddd" # Master 11.11.2022
VCPKG_VERSION = "1cc9525" # Master 15.02.2023
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
FFMPEG_VERSION = "5.0.1"

2
Tools/setup.py
View File

@ -116,7 +116,7 @@ def main():
if system() == "Windows":
vcpkg_command = "vcpkg.exe"
vcpkg_packages_list.append("infoware[d3d]")
vcpkg_packages_list.append("sentry-native")
vcpkg_packages_list.append("sentry-native[transport]")
platform_command = commands_list()
platform_command.add("bootstrap-vcpkg.bat", vcpkg_path, False)
vcpkg_triplet = ["x64-windows"]