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
..
assets	Rename ScreenPlayWindow to the more fitting ScreenPlayWallpaper	2019-07-26 13:08:27 +02:00
qml	Remove window blur call because it is only available on mac	2021-09-04 14:04:08 +02:00
src	Move all qml files from all project into qml subfolder	2021-08-14 13:38:24 +02:00
CMakeLists.txt	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
Info.plist	Add macOS code signing	2021-08-08 19:31:50 +02:00
main.cpp	Add live reloading to Widgets	2021-05-14 13:11:12 +02:00
SPWidgetResources.qrc	Move all qml files from all project into qml subfolder	2021-08-14 13:38:24 +02:00