Elias Steurer 4504f06eb1 Merge branch 'master' into qt6-support ... # Conflicts: # CMakeLists.txt # ScreenPlay/app.h # ScreenPlay/main.cpp # ScreenPlay/main.qml # ScreenPlay/qml/Navigation/Navigation.qml # ScreenPlay/src/settings.h # ScreenPlay/translations/ScreenPlay_zh_cn.qm # ScreenPlayWallpaper/CMakeLists.txt # ScreenPlayWallpaper/SPWResources.qrc # ScreenPlayWallpaper/qml/Wallpaper.qml		2021-09-10 11:09:38 +02:00
..
kde/ScreenPlay	Add qt6 support	2021-07-15 12:07:39 +02:00
qml	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
src	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
CMakeLists.txt	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
dot.png	Rename ScreenPlayWindow to the more fitting ScreenPlayWallpaper	2019-07-26 13:08:27 +02:00
index.html	Fix set replace wallpaper from type video to gif	2021-02-19 17:21:17 +01:00
Info.plist	Add macOS code signing	2021-08-08 19:31:50 +02:00
main.cpp	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
qtquickcontrols2.conf	Some refactoring of the wallpaper. Split video/webview into seperate qml file.	2019-11-23 17:22:24 +01:00
SPWResources.qrc	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00