[pull] main from jamulussoftware:main #141
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Only the Android build makes use of the submodule for oboe, so no need to fetch it when building other architectures.
In Advanced Settings, changes the method of deleting a custom directory to use a delete button, for consistency with the similar method in Connect.
#3233 UI: Common method to delete server and custom directory entries
Previously, translations were embedded manually, via src/resources.qrc Now they are compiled and embedded automatically, using embed_translations, which allows them to be correctly located for multiple targets or archs. Note that RCC_DIR and LRELEASE_DIR can no longer be specified, because the system defaults are necessary for multiple targets/archs to build correctly. The version of Qt must be at least 5.12 for lrelease and embed_translations.
The resources generated by embed_translations include the .qm from the filename in the resource name, so it is necessary to remove it. Also, the prefix generated by qmake is /i18n, not /translations.
Now that the .qm files are generated on the fly by the Makefile, a manual lrelease step is no longer needed and wouldn't work correctly.
Github have deprecated macos-11 as a runner, and will remove it on 28 Jun 2024. See https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/ for the announcement.
The macos-12 runner doesn't offer xcode 12.5.1, but only the following: 14.2.0, 14.1.0, 14.0.1, 13.4.1, 13.3.1, 13.2.1, 13.1.0 So choosing the most recent in the xcode-13 series.
Build: Generate qm files and embedded resource during build
Add debug_and_release to use separate build dirs
…quit Fixes 3287: Only deregister on quit
This fixes the width problem on Mac, and also makes them consistent with the delete buttons in the Server GUI Options dialog.
Convert delete buttons to from QPushButton to QToolButton
Update server CLI options link for issue #971
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )