Elias Steurer
20287fc11a
Merge branch '165-pack-screenplay-into-a-single-app-on-osx' into 'master'
...
Resolve "Pack ScreenPlay into a single .app on osx"
Closes #165
See merge request kelteseth/ScreenPlay!102
2023-02-11 15:01:26 +00: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
03c8d275d0
Refactor launch.json
...
Lets use variables instead of hardcoded paths
2023-02-09 16:35:43 +01:00
Elias Steurer
8b10e5989f
Add basic .dmg bundle support
2023-02-09 16:35:08 +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
b6f5fc91ad
Merge branch '161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' into 'master'
...
Resolve "Refactor ScreenPlayWallpaper to no longer inherit from BaseWindow"
Closes #161
See merge request kelteseth/ScreenPlay!101
2023-02-04 11:55:37 +00:00
Elias Steurer
c52e25a4b3
Merge remote-tracking branch 'origin/161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' into 161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow
2023-02-04 12:16:31 +01:00
Elias Steurer
924819bb0b
Formatting
2023-02-04 12:16:24 +01:00
Elias Steurer
e96f80c68c
Fix linux compilation
2023-02-04 12:15:41 +01:00
Elias Steurer
c8f5665e35
Merge remote-tracking branch 'origin/161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' into 161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow
2023-02-04 12:01:31 +01:00
Elias Steurer
dbd92317ee
Add missing xml dependency
2023-02-04 12:01:07 +01:00
Elias Steurer
cbf8978c68
Add SPDX license
2023-02-04 11:56:23 +01:00
Elias Steurer
2b0d58f6de
Merge branch '161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' of https://gitlab.com/kelteseth/ScreenPlay into 161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow
2023-02-04 11:54:59 +01:00
Elias Steurer
2b5d990c7c
Fix save autostart changes ever time
...
This fixes issue 163
2023-02-04 11:54:44 +01:00
Elias Steurer
6501a4c79f
Add automatic moc include for faster compile times
2023-02-04 11:42:32 +01:00
Elias Steurer
58340a2bf1
Merge branch '161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' of https://gitlab.com/kelteseth/ScreenPlay into 161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow
2023-02-04 10:51:24 +01:00
Elias Steurer
df33695e7d
Add osx close icon and remove hardcoded size
2023-02-04 10:51:16 +01:00
Elias Steurer
46391d1e5d
Fix osx compilation
2023-02-03 17:55:22 +01:00
Elias Steurer
13959b39cf
Fix still using old FolderDialog labs api
2023-02-03 17:07:44 +01:00
Elias Steurer
d129bf5cf4
Fix long standing qml error internal crash
...
We now wait until the event loop is done until
we call terminate. Before ScreenPlayWallpaper would
crash internally and stay alive as a zombie process for some
reason...
2023-02-03 17:03:10 +01:00
Elias Steurer
10eabc0a56
Formatting
2023-02-03 16:18:13 +01:00
Elias Steurer
4bce0a2cab
Remove QApplication in favor of QGuiApplication
2023-02-03 16:17:47 +01:00
Elias Steurer
d2919576d8
Remove hardcoded string in favor of enum
2023-02-03 15:44:25 +01:00
Elias Steurer
0a1da4f4a7
Fix all wallpaper except video not showing
2023-02-03 15:44:06 +01:00
Elias Steurer
a90f2a8fc3
Merge remote-tracking branch 'origin/161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' into 161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow
2023-02-03 12:45:46 +01:00
Elias Steurer
2c2030b437
Remove deprecated Qt.labs.platform
...
Remove own ColorPicker in favor if Qt 6.4
2023-02-03 12:45:42 +01:00
Elias Steurer
c4b2bcc67f
Remove deprecated Qt.labs.settings and fix quit
2023-02-03 12:31:59 +01:00
Elias Steurer
0d8d0cef58
Fix osx build.py args
2023-02-03 11:48:26 +01:00
Elias Steurer
d07f3db58e
Fix python version for windows and unix
2023-02-03 11:45:49 +01:00
Elias Steurer
348b06e4ce
Fix .5sec white frame at the beginning
2023-02-03 10:50:19 +01:00
Elias Steurer
829cec6e91
Fix windows launch type
2023-02-03 10:49:16 +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
bd4c7e0bcf
Fix argument
2023-02-02 15:35:35 +01:00
Elias Steurer
2c12dd4ad4
Update docs
2023-02-02 15:34:18 +01:00
Elias Steurer
17347f324e
Remove update translations from CMake to python script
2023-02-02 15:34:09 +01:00
Elias Steurer
83bb652132
Add tasks.json and format all files
2023-02-02 15:25:26 +01:00
Elias Steurer
f942ce16dc
Remove dark mode workaround
...
https://bugreports.qt.io/browse/QTBUG-72028?focusedCommentId=704716&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-704716
2023-02-02 09:44:30 +01:00
Elias Steurer
11d89432a0
Fix Linux and OSX compilation
2023-01-30 16:46:39 +01:00
Elias Steurer
f9bc5c7112
Fix ffmpeg setup deleting wrong file
2023-01-29 14:07:09 +01:00
Elias Steurer
960a6db915
Remove unused Particles import
2023-01-29 13:50:21 +01:00
