Elias Steurer 6b653bdfdc Merge branch 'master' into qt6-support ... # Conflicts: # .gitlab-ci.yml # CMakeLists.txt # ScreenPlay/CMakeLists.txt # ScreenPlay/qml/Workshop/Workshop.qml # ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml # ScreenPlay/translations/ScreenPlay_.ts # ScreenPlay/translations/ScreenPlay_de.ts # ScreenPlay/translations/ScreenPlay_es.ts # ScreenPlay/translations/ScreenPlay_fr.ts # ScreenPlay/translations/ScreenPlay_ko.ts # ScreenPlay/translations/ScreenPlay_pt_br.ts # ScreenPlay/translations/ScreenPlay_ru.ts # ScreenPlay/translations/ScreenPlay_vi.qm # ScreenPlay/translations/ScreenPlay_vi.ts # ScreenPlay/translations/ScreenPlay_zh_cn.ts		2021-09-26 17:56:40 +02:00
..
kde/ScreenPlay	Remove versioned qml imports #2	2021-09-10 12:45:15 +02:00
qml	Fix qt6 qml capture =>	2021-09-10 12:45:54 +02:00
src	Merge branch 'master' into qt6-support	2021-09-26 17:56:40 +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	Remove versioned qml imports #2	2021-09-10 12:45:15 +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