aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ship Qt's translation together with AppImage.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-04-17 21:25:22 +03:00
parent 161d019f29
commit d67df44d9c
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/AppImage/AppImageBuilder.yml vendored
View File

@ -41,6 +41,7 @@ AppDir:
- qt515imageformats - qt515imageformats
- qt515svg - qt515svg
- qt515xmlpatterns - qt515xmlpatterns
- qt515translations
- libpango-1.0-0 - libpango-1.0-0
files: files:
include: [] include: []
@ -89,6 +90,20 @@ AppDir:
- opt/qt515/plugins/egldeviceintegrations - opt/qt515/plugins/egldeviceintegrations
- opt/qt515/plugins/platforminputcontexts - opt/qt515/plugins/platforminputcontexts
- opt/qt515/plugins/sqldrivers - opt/qt515/plugins/sqldrivers
- /opt/qt515/translations/assistant*.qm
- /opt/qt515/translations/designer*.qm
- /opt/qt515/translations/linguist*.qm
- /opt/qt515/translations/qt_help*.qm
- /opt/qt515/translations/qtconnectivity*.qm
- /opt/qt515/translations/qtdeclarative*.qm
- /opt/qt515/translations/qtlocation*.qm
- /opt/qt515/translations/qtmultimedia*.qm
- /opt/qt515/translations/qtquickcontrols2*.qm
- /opt/qt515/translations/qtquickcontrols*.qm
- /opt/qt515/translations/qtscript*.qm
- /opt/qt515/translations/qtserialport*.qm
- /opt/qt515/translations/qtwebengine*.qm
- /opt/qt515/translations/qtwebsockets*.qm
runtime: runtime:
env: env:
APPDIR_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/opt/qt515/lib:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders:$APPDIR/usr/local/lib/valentina" APPDIR_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/opt/qt515/lib:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders:$APPDIR/usr/local/lib/valentina"

1
qbs/modules/buildconfig/buildconfig.qbs
View File

@ -149,7 +149,6 @@ Module {
if (enableAppImage && qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) if (enableAppImage && qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos"))
defines.push('APPIMAGE'); defines.push('APPIMAGE');
defines.push('APPIMAGE_QT_TRANSLATIONS="' + FileInfo.joinPaths(qbs.installPrefix, "translations") + '"');
if (enableMultiBundle) if (enableMultiBundle)
defines.push('MULTI_BUNDLE'); defines.push('MULTI_BUNDLE');

4
src/libs/vmisc/vabstractapplication.cpp
View File

@ -278,7 +278,7 @@ auto VAbstractApplication::QtTranslationsPath(const QString &locale) -> QString
#if defined(APPIMAGE) #if defined(APPIMAGE)
Q_UNUSED(locale) Q_UNUSED(locale)
/* Fix path to translations when run inside AppImage. */ /* Fix path to translations when run inside AppImage. */
return AppImageRoot() + APPIMAGE_QT_TRANSLATIONS; return AppImageRoot() + QLibraryPath(QLibraryInfo::TranslationsPath);
#else #else
return translationsPath(locale); return translationsPath(locale);
#endif // defined(APPIMAGE) #endif // defined(APPIMAGE)
@ -371,7 +371,7 @@ void VAbstractApplication::LoadTranslation(QString locale)
LoadQM(qtTranslator, QStringLiteral("qt_"), locale, qtQmDir); LoadQM(qtTranslator, QStringLiteral("qt_"), locale, qtQmDir);
installTranslator(qtTranslator); installTranslator(qtTranslator);
#if defined(Q_OS_WIN) && !defined(QBS_BUILD) #if (defined(Q_OS_WIN) && !defined(QBS_BUILD)) || defined(APPIMAGE)
qtxmlTranslator = new QTranslator(this); qtxmlTranslator = new QTranslator(this);
LoadQM(qtxmlTranslator, QStringLiteral("qtxmlpatterns_"), locale, qtQmDir); LoadQM(qtxmlTranslator, QStringLiteral("qtxmlpatterns_"), locale, qtQmDir);
installTranslator(qtxmlTranslator); installTranslator(qtxmlTranslator);