3 Commits

Author	SHA1	Message	Date
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
Elias Steurer	6d4f48013e	Remove not needed import that only works on windows anyways	2021-08-16 15:59:30 +02:00
Elias Steurer	bb5e753291	Move all qml files from all project into qml subfolder ... This makes the build script easier	2021-08-14 13:38:24 +02:00