diff --git a/dist/AppImage/AppImageBuilder.yml b/dist/AppImage/AppImageBuilder.yml index 89a7241ba..221e4ef8e 100644 --- a/dist/AppImage/AppImageBuilder.yml +++ b/dist/AppImage/AppImageBuilder.yml @@ -41,6 +41,7 @@ AppDir: - qt515imageformats - qt515svg - qt515xmlpatterns + - qt515translations - libpango-1.0-0 files: include: [] @@ -89,6 +90,20 @@ AppDir: - opt/qt515/plugins/egldeviceintegrations - opt/qt515/plugins/platforminputcontexts - 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: 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" diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs index 4c9d0da35..179fedd4e 100644 --- a/qbs/modules/buildconfig/buildconfig.qbs +++ b/qbs/modules/buildconfig/buildconfig.qbs @@ -149,7 +149,6 @@ Module { if (enableAppImage && qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) defines.push('APPIMAGE'); - defines.push('APPIMAGE_QT_TRANSLATIONS="' + FileInfo.joinPaths(qbs.installPrefix, "translations") + '"'); if (enableMultiBundle) defines.push('MULTI_BUNDLE'); diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp index f9765d075..c3c604363 100644 --- a/src/libs/vmisc/vabstractapplication.cpp +++ b/src/libs/vmisc/vabstractapplication.cpp @@ -278,7 +278,7 @@ auto VAbstractApplication::QtTranslationsPath(const QString &locale) -> QString #if defined(APPIMAGE) Q_UNUSED(locale) /* Fix path to translations when run inside AppImage. */ - return AppImageRoot() + APPIMAGE_QT_TRANSLATIONS; + return AppImageRoot() + QLibraryPath(QLibraryInfo::TranslationsPath); #else return translationsPath(locale); #endif // defined(APPIMAGE) @@ -371,7 +371,7 @@ void VAbstractApplication::LoadTranslation(QString locale) LoadQM(qtTranslator, QStringLiteral("qt_"), locale, qtQmDir); installTranslator(qtTranslator); -#if defined(Q_OS_WIN) && !defined(QBS_BUILD) +#if (defined(Q_OS_WIN) && !defined(QBS_BUILD)) || defined(APPIMAGE) qtxmlTranslator = new QTranslator(this); LoadQM(qtxmlTranslator, QStringLiteral("qtxmlpatterns_"), locale, qtQmDir); installTranslator(qtxmlTranslator);