1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-07-08 05:48:09 +02:00
Commit Graph

25 Commits

Author SHA1 Message Date
Elias Steurer
b8560d6e48 Update third party dependencies 2023-11-29 10:36:58 +01:00
Elias Steurer
55996b2914 Change cpp defines to CMakeVariables.h.in vars 2023-11-09 10:32:28 +01:00
Elias Steurer
ffd26f3deb Merge remote-tracking branch 'origin/master' into 174-add-godot-wallpaper-support
# Conflicts:
#	.gitignore
#	.gitlab/ci/base_jobs.yml
#	.vscode/extensions.json
#	.vscode/launch.json
#	CMakePresets.json
#	ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/WaitingForScreenplay.qml
#	Tools/setup.py
2023-10-29 13:31:19 +01:00
Elias Steurer
f546c35f44 Resolve "Add Wayland layer shell support" 2023-10-29 10:26:42 +00:00
Elias Steurer
fae6555f5a Update to Qt 6.6.0 2023-10-22 17:29:34 +02:00
Elias Steurer
9f4692b808 Update to Qt 6.5.2 and bump to 5.15.1
Default to ffmpeg on windows
2023-07-24 16:22:09 +02:00
Elias Steurer
287730e9c7 Change macos building fat universal binary as default
For this we now use a custom triplet. This has some drawbacks like openssl
does not work with this config. Luckily we can
use openssl that is provided by Qt. On macOS
they use Secure Transport.
2023-06-02 09:51:56 +02:00
Elias Steurer
9b8b8e0374 Update to Qt 6.5.1
This removed the QWebEngine workaround and fixes ffmpeg looping,
but introduces ffmpeg crash.
2023-05-25 15:14:16 +02:00
Elias Steurer
75d72de5b7 Update min CMake version to 3.26 (and QtCreator 10)
This will allow us to remove all of the hardcoded paths
2023-03-30 17:49:02 +02:00
Elias Steurer
f557919419 Add release preset 2023-03-02 13:14:39 +01:00
Elias Steurer
31005092be Bump version to 0.15.0-RC5 2023-01-29 13:26:36 +01:00
Elias Steurer
4dab506b41 Fix linux compilation
- Downgrade to stable Qt for now, because linux mirrors are not yet updated
- Launch.json linux "type": "lldb" does not work for some reason...
2023-01-27 10:04:51 +01:00
Elias Steurer
64d2c3adb5 Bump to Qt 6.5.0 and use FFMPEG
FFMPEG will become default in 6.6.0 anyways
and this fixes the broken rendering on osx and performs
better on my AMD Vega VII on Windows
2023-01-27 09:01:37 +01:00
Elias Steurer
cbc4ad7757 Refactor launch.json for better multi os usage 2023-01-22 16:25:04 +01:00
Elias Steurer
8b831ac9c8 Bump to Qt 6.4.2
Fix qt paths still using Qt Maintenance
2023-01-07 12:30:18 +01:00
Elias Steurer
736b4a25bf Add working macos launch.json
Remove mac only files from linux/windows build
2022-12-28 11:36:16 +01:00
Elias Steurer
e0e02cfcde Fix macOS qt 6.4.1 broken QWebEngine
Lets use 6.3.2 for now until
https://bugreports.qt.io/browse/QTBUG-96406
is fixed
2022-12-17 13:29:31 +01:00
Elias Steurer
3042de6d3b Change aqt download dir to be the same as vcpkg
This removes the inconsistency and bundles all dependencies
in one folder.
2022-12-17 12:52:00 +01:00
Elias Steurer
1632cc2b04 Add working macOS preset 2022-12-17 11:51:50 +01:00
Elias Steurer
b5aa584337 Remove Qt Maintenance tool requirement 2022-12-16 13:34:15 +01:00
Elias Steurer
5ebf5a7aed Add working MSVC prest. Warning MSVC 2022 and SDK version must match! 2022-12-16 11:14:25 +01:00
Elias Steurer
cb757d33c7 Fix linux CMakePresets file 2022-12-15 14:55:47 +01:00
Elias Steurer
717a182af8 Fix cmake argument
x64 argument by vcpkg is
x86_64 in cmake...

Update to Qt 6.3.1
2022-07-22 14:18:04 +02:00
Elias Steurer
3c92cf9bd0 Add linux vscode setup without qt account 2022-06-12 18:49:00 +02:00
Elias Steurer
d9eb9a567b Add CMakePresets.json
Does only work with clang for some reason. I get random errors
when selecting cl compiler
https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-170#select-your-compilers
2022-05-20 15:52:19 +02:00