1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-01 08:09:48 +02:00
Commit Graph

195 Commits

Author SHA1 Message Date
Elias Steurer
58567987aa Remove ScreePlay version from defines.py
We now use always the latest set git tag as version.
This means we also no longer need to add it as an argument
2023-08-17 14:26:39 +02:00
Elias Steurer
ebff53948c Change build args to have double -
Split builds into regular and official
git tag release builds
2023-08-12 11:53:34 +02:00
Elias Steurer
efc70e9fc0 Change CI to split into multile sections
Change version to be only set via git tags
2023-08-11 17:00:24 +02:00
Elias Steurer
9f4692b808 Update to Qt 6.5.2 and bump to 5.15.1
Default to ffmpeg on windows
2023-07-24 16:22:09 +02:00
Elias Steurer
7abc937e0e Update choco package 2023-07-02 12:15:45 +02:00
Elias Steurer
a27984d58e Update ScreenPlay version to 0.15.0 2023-07-01 11:14:41 +02:00
Elias Steurer
961f648e33 Add interactive Wallpaper example (windows only) 2023-06-29 20:31:59 +02:00
Elias Steurer
73f31d2092 Update IFW version 2023-06-11 10:38:52 +02:00
Elias Steurer
8790620da5 Merge branch 'master' of https://gitlab.com/kelteseth/ScreenPlay 2023-06-02 19:26:39 +02:00
Elias Steurer
5ea4c57f1b Update vcpkg 2023-06-02 19:26:31 +02:00
Elias Steurer
72a3ffba76 Fix macOS paths and remove old lipo script 2023-06-02 18:51:20 +02:00
Elias Steurer
dfd311c5d5 Merge commit 'e85c5ac6b69f38976521f9fd842f5b5a47c08cc9'
# Conflicts:
#	Tools/defines.py
2023-06-02 13:25:42 +02:00
Elias Steurer
ac00f94dc5 Remove old download script and fix openssl on win 2023-06-02 10:19:47 +02:00
Elias Steurer
11905a6370 Cleanup and small fixes 2023-06-02 10:19:12 +02:00
Elias Steurer
287730e9c7 Change macos building fat universal binary as default
For this we now use a custom triplet. This has some drawbacks like openssl
does not work with this config. Luckily we can
use openssl that is provided by Qt. On macOS
they use Secure Transport.
2023-06-02 09:51:56 +02:00
Elias Steurer
9b8b8e0374 Update to Qt 6.5.1
This removed the QWebEngine workaround and fixes ffmpeg looping,
but introduces ffmpeg crash.
2023-05-25 15:14:16 +02:00
Elias Steurer
e85c5ac6b6 WIP on master: 844215db Update steamSDK to 1.56 2023-04-21 11:13:30 +02:00
Elias Steurer
844215db5e Update steamSDK to 1.56 2023-04-06 12:08:04 +02:00
Elias Steurer
e96b3fd35b Remove Common folder in favor of ThirdParty 2023-02-18 12:11:29 +01:00
Elias Steurer
df216ec42d Bump to 0.15.0-RC6 2023-02-16 13:19:21 +01:00
Elias Steurer
db9d319388 Add Qt 6.5 looping workaround
Remove Qt6Widgets workaround

Update to latest vcpkg
Update to latest plausible-qml
Update to latest QArchive
2023-02-16 13:06:50 +01:00
Elias Steurer
ef8b31c18b Fix resetting the cmake_osx_architectures 2023-02-11 15:17:50 +01:00
Elias Steurer
858e72e066 Default to x64 for first build on osx 2023-02-11 14:12:44 +01:00
Elias Steurer
5abaf85b3f Remove seperate signing step and put it into the build step
Fix qt path
2023-02-11 13:53:44 +01:00
Elias Steurer
06b7306173 Fix missing triplet and architecture 2023-02-11 13:23:32 +01:00
Elias Steurer
515e57d280 Remove workaround 2023-02-11 13:10:54 +01:00
Elias Steurer
6e2cecddb3 Fix compilation and signing
Move TrayIcon back to ScreenPlay:
- This fixes the missing labs plugins when running the macdeployqt script
- We don't need it here only in the SP main folder anyway

Move building and sign of the osx version for x64 and arm64 into the
actual build script.

Remove the qml plugin path workaround from the addImportPath
2023-02-11 11:57:09 +01:00
Elias Steurer
c9556f08d2 Remove outdated comment 2023-02-09 11:53:20 +01:00
Elias Steurer
fab7d0f4c3 Add docs 2023-02-09 11:52:12 +01:00
Elias Steurer
19ce4ce823 Fix sign script 2023-02-04 17:53:57 +01:00
Elias Steurer
abddca8685 Remove seperate .app for wallpaper and widgets 2023-02-04 17:34:59 +01:00
Elias Steurer
d07d26eefb Add deploy workaround for QTBUG-110937 2023-02-04 16:00:57 +01:00
Elias Steurer
6de0f7f167 Fix publish scipt not removing quotes 2023-02-04 14:06:48 +01:00
Elias Steurer
cbf8978c68 Add SPDX license 2023-02-04 11:56:23 +01:00
Elias Steurer
6501a4c79f Add automatic moc include for faster compile times 2023-02-04 11:42:32 +01:00
Elias Steurer
6f5fabeb0e Add qtconnectivity to fix windeploqt and macdeployqt
For some reason scene2d.dll need Qt6Bluetooth. What even is scene2d?
2023-02-03 10:16:39 +01:00
Elias Steurer
17347f324e Remove update translations from CMake to python script 2023-02-02 15:34:09 +01:00
Elias Steurer
f9bc5c7112 Fix ffmpeg setup deleting wrong file 2023-01-29 14:07:09 +01:00
Elias Steurer
31005092be Bump version to 0.15.0-RC5 2023-01-29 13:26:36 +01:00
Elias Steurer
9b97d81e39 Bump to 6.5 on all platforms 2023-01-29 13:03:03 +01:00
Elias Steurer
64cde196eb Update qdoc and formatting
turns out we need the Q_PROPERTY setter
in the cpp file for qdoc to recognize it
2023-01-28 11:02:10 +01:00
Elias Steurer
4dab506b41 Fix linux compilation
- Downgrade to stable Qt for now, because linux mirrors are not yet updated
- Launch.json linux "type": "lldb" does not work for some reason...
2023-01-27 10:04:51 +01:00
Elias Steurer
64d2c3adb5 Bump to Qt 6.5.0 and use FFMPEG
FFMPEG will become default in 6.6.0 anyways
and this fixes the broken rendering on osx and performs
better on my AMD Vega VII on Windows
2023-01-27 09:01:37 +01:00
Elias Steurer
97b05c5ff9 Refactor qml format script
Lets not add the changes now, but later, because this
was a flyby work.
2023-01-22 16:29:20 +01:00
Elias Steurer
7871573179 Update to use SPDX-License-Identifier 2023-01-19 10:33:49 +01:00
Elias Steurer
9951faf137 Bump ScreenPlay version 2023-01-07 12:47:15 +01:00
Elias Steurer
8b831ac9c8 Bump to Qt 6.4.2
Fix qt paths still using Qt Maintenance
2023-01-07 12:30:18 +01:00
Elias Steurer
04c86508ef Remove Qt Maintanance build in favor of aqt
Update osx steam contentbuilder bins
Add skip build option
2023-01-05 13:42:58 +01:00
Elias Steurer
e0e02cfcde Fix macOS qt 6.4.1 broken QWebEngine
Lets use 6.3.2 for now until
https://bugreports.qt.io/browse/QTBUG-96406
is fixed
2022-12-17 13:29:31 +01:00
Elias Steurer
3042de6d3b Change aqt download dir to be the same as vcpkg
This removes the inconsistency and bundles all dependencies
in one folder.
2022-12-17 12:52:00 +01:00