Elias Steurer
|
c74e80f00a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ScreenPlayWallpaper/qml/Wallpaper.qml
|
2021-11-13 14:30:02 +01:00 |
|
Elias Steurer
|
b78f20a4bf
|
Refactor platform check
|
2021-11-13 14:26:48 +01:00 |
|
Elias Steurer
|
ee1ee157c9
|
Merge commit '4c29196a14da422b5553671428b47f201ebe9335'
|
2021-11-12 15:26:54 +01:00 |
|
Elias Steurer
|
77daa040bb
|
Fix HTML Wallpaper
Remove old WebView that is now MultimediaWebView
|
2021-11-12 14:56:22 +01:00 |
|
Elias Steurer
|
c15920ea1d
|
Fix incorrect platform check
|
2021-11-09 10:30:44 +01:00 |
|
Elias Steurer
|
6a3395286a
|
Fix osx only check
|
2021-11-01 19:12:58 +01:00 |
|
Elias Steurer
|
8074535cfb
|
Fix local webengine video loading...
When using the index.html from the qrc file
we cannot load local content for some reason...
Add Windows looping workaround
|
2021-11-01 18:25:46 +01:00 |
|
Elias Steurer
|
e155879e37
|
Merge remote-tracking branch 'origin/qt6-support' into qt6-support
|
2021-10-23 13:46:54 +02:00 |
|
Elias Steurer
|
0419676af2
|
Add MultimediaWebView
This is for now macOS only because macOS MM only can play h264,
so we still need the webview to render webm
|
2021-10-23 10:35:15 +02:00 |
|
Elias Steurer
|
feb9648684
|
Refactor to use Qt6 style cmake/qml plugins
|
2021-10-15 15:06:05 +02:00 |
|
Elias Steurer
|
3650f9bfb1
|
Remove more deprecated version import
|
2021-10-08 10:14:11 +02:00 |
|
Elias Steurer
|
b52f9fcfa8
|
Fix qt6 qml capture =>
|
2021-09-10 12:45:54 +02:00 |
|
Elias Steurer
|
b0c36c4c67
|
Remove versioned qml imports #2
Fix some labs file dialogs
|
2021-09-10 12:45:15 +02:00 |
|
Elias Steurer
|
2b7d6422bd
|
Fix wallpaper playing
|
2021-09-10 11:36:47 +02:00 |
|
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 |
|