1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Commit Graph

15 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
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
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
Elias Steurer
8e117cebfd Call format-cmake.py 2020-10-29 18:53:52 +01:00
Elias Steurer
d6b27d30a5 Remove CMake min version to only set it in main CMakeList.txt 2020-10-02 21:29:11 +02:00
Elias Steurer
ddad721574 Add basic shader plugin 2020-09-10 11:40:07 +02:00
Elias Steurer
e1b40a7d4c More settings save reworking 2020-07-31 11:58:05 +02:00
Elias Steurer
12ab2a24a6 Fix SDK to properly export header files 2020-07-13 17:58:03 +02:00
Elias Steurer
9ce9467dd7 Fix cmake be compilable on linux
Downgrade to 3.16 that ships with Ubuntu 20.04
Fix QML modules that does not exists ( cmake on Windows just ignores this lol)
2020-05-16 13:37:32 +02:00
Elias Steurer
c7fd69a78e Add first working cmake version for ScreenPlay
Refactor stomt sdk from qmake/github to cmake/gitlab
2020-04-30 20:03:14 +02:00
Elias Steurer
8b347cad9f Fix version an add auto install script to replace install-dependencies 2020-03-16 11:50:35 +01:00
Elias Steurer
2e20673e67 Fix cmake files to be able to open the project in QtCreator 2020-03-10 12:34:34 +01:00
Elias Steurer
d1bee5aa8f Add autoconversion based of https://github.com/davidtazy/QMake2CMake 2020-03-10 12:16:58 +01:00