Merge ede0b7589d
into 684e3a1f06
commit
5c41356fc8
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <QCoreApplication>
|
||||
#include <QStringBuilder>
|
||||
#include <QLibraryInfo>
|
||||
|
||||
namespace governikus
|
||||
{
|
||||
|
@ -27,6 +28,9 @@ class FileDestination
|
|||
#elif defined(Q_OS_MACOS) && defined(QT_NO_DEBUG)
|
||||
return QCoreApplication::applicationDirPath() + QStringLiteral("/../Resources");
|
||||
|
||||
#elif defined(Q_OS_LINUX) && defined(QT_NO_DEBUG)
|
||||
return QStringLiteral("/usr/share/AusweisApp2");
|
||||
|
||||
#else
|
||||
return QCoreApplication::applicationDirPath();
|
||||
|
||||
|
@ -37,7 +41,12 @@ class FileDestination
|
|||
public:
|
||||
static QString getPath(const QString& pFilename)
|
||||
{
|
||||
return getPath() % QLatin1Char('/') % pFilename;
|
||||
#if defined(Q_OS_LINUX) && defined(QT_NO_DEBUG)
|
||||
if (pFilename == QStringLiteral("translations"))
|
||||
return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
|
||||
else
|
||||
#endif
|
||||
return getPath() % QLatin1Char('/') % pFilename;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue