i18n: use qt6 dir for translations when building on qt6 #2813
Conversation
|
Thank you for taking that challenge on! Unfortunately, changing that has a lot of implications, since the path is used a lot: https://github.com/search?q=repo%3Apbek%2FQOwnNotes%20%22qt5%2Ftranslations%22&type=code |
|
@pbek from what I can tell, of the 7 results in the linked search, |
src/main.cpp
Outdated
| @@ -49,8 +49,13 @@ void loadTranslations(QTranslator *translator, const QString &locale) { | |||
| loadTranslation(translator[5], appPath + "/languages/QOwnNotes_" + locale); | |||
| loadTranslation(translator[6], appPath + "/QOwnNotes_" + locale); | |||
| loadTranslation(translator[7], "../src/languages/QOwnNotes_" + locale); | |||
| #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) | |||
There was a problem hiding this comment.
You'll need a >= check here, wouldn't you?
charliewolf
force-pushed
the
wolf/translation-dir-patch
branch
from
df79117
to
6193950
Compare
|
Will need changes too: Line 62 in 68c860e |
charliewolf
force-pushed
the
wolf/translation-dir-patch
branch
from
6193950
to
a8d385e
Compare
|
got it, added a check in |
|
I tested building on NixOS with Qt 6 and for some reason the |
|
i'm not familiar with nix but this patch worked for me on RHEL 9. did it create the qt5 dir or what did it do? |
|
I got it working now. LGTM. Thank you. |
|
Hm, seems like a lot of Qt6 builds break... |
Hi is support for Qt6 complete now? |
Yes, quite a while ago... |
Oh. Would you have some time to update ebuilds then? They still force qt5. |
|
Sure, just send in a PR for the changes in https://github.com/pbek/QOwnNotes/blob/main/build-systems/gentoo/qownnotes.ebuild, I don't really have a Gentoo sitting around. I'm mainly on NixOS. 😉 |
hi, i'm working on updating a qownnotes rpm spec to support qt6 and ran into some issues with this hardcoded path.