Fix resource handling on Qt and use Roboto #11162
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
It was no longer being used or linked, so it just meant the assets were missing. With this removed, the assets (lang inis, shaders, etc.) are available again. Fixes hrydgard#9831 - likely broken since hrydgard#9061, which stopped using the qrc.
May improve font fallback issues in hrydgard#7581.
|
Nice. |
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.
As of #9061, we stopped using the qrc to bundle files into the Qt app. But we didn't remove the code looking up files this way, so it just meant they were gone.
This fixes lookup of assets on Qt, restoring languages and shader lists. Fixes #9832 (not sure if that works with PRs.)
Additionally, it uses Roboto like on other platforms, which I suspect will help #7581 (but have not tested diacritics specifically.) I personally think Roboto Condensed (our v1 of it) looks a lot better than the default font.
This also allows language inis to override the font, like on Windows. It uses the same translation string, not sure if that could be an issue.
-[Unknown]