Elias Steurer
0f5b310f68
Merge branch 'master' into qt6-kde
...
# Conflicts:
# ScreenPlay/CMakeLists.txt
# ScreenPlay/app.cpp
# ScreenPlay/src/screenplaymanager.cpp
# Tools/build.py
2021-12-31 13:32:37 +01:00
Elias Steurer
b52c89c933
Fix mixed scaling issues (again)
...
Now we no longer trust Qt and use the data
we get from the Windows api directly.
Move monitor query function into util to be used
later in the main app, because we also must
user the correct values there.
2021-11-13 14:12:19 +01:00
Elias Steurer
8615d7371f
Add basic http server
...
this is for content like godot webasm
that is only able to be shown from a
webserver
2021-10-23 18:34:25 +02:00
Elias Steurer
feb9648684
Refactor to use Qt6 style cmake/qml plugins
2021-10-15 15:06:05 +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
59758487b4
Fix missing QtQuickCompiler and qrc
2021-07-16 16:44:28 +02:00
Elias Steurer
fe2be3665e
Make ScreenPlayWorkshop open source
2021-07-16 11:14:21 +02:00
Elias Steurer
d5276b8169
Add Qt5 and Qt6 compatibility to CMake
...
Because the WebEngine got renamed we have
to make it this ugly. This will only work with Qt5
for now because Qt6 still breaks things.
2021-07-11 08:27:13 +02:00
Elias Steurer
2fb9e728d0
Format target_link_libraries
2021-06-25 16:28:30 +02:00
Elias Steurer
a577decdc9
Add some Qt6 cmake support
...
WebEngine is missing because the current 6.2 installed
has a broken WebEngine
2021-06-20 18:50:54 +02:00
Elias Steurer
3dd2ff0852
Move projectfile to be used elsewhere
2021-02-03 17:52:29 +01:00
Elias Steurer
4dcea75242
Move util functions and global enums into dedicated lib
...
This will make reusing easier like enum parsing between
ScreenPlay and ScreenPlayWallpaper &
project load/save
2021-01-28 15:19:46 +01:00