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

Move SetICUData on top.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-11-28 19:00:23 +02:00
parent 5ca33d5b3f
commit 002f86b1a8
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/tape/main.cpp
View File

@ -36,13 +36,6 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
Q_INIT_RESOURCE(tapeicon);
Q_INIT_RESOURCE(theme);
Q_INIT_RESOURCE(icon);
Q_INIT_RESOURCE(schema);
Q_INIT_RESOURCE(flags);
Q_INIT_RESOURCE(style);
#if defined(APPIMAGE) && defined(Q_OS_LINUX) #if defined(APPIMAGE) && defined(Q_OS_LINUX)
/* When deploying with AppImage based on OpenSuse, the ICU library has a hardcoded path to the icudt*.dat file. /* When deploying with AppImage based on OpenSuse, the ICU library has a hardcoded path to the icudt*.dat file.
* This prevents the library from using shared in memory data. There are few ways to resolve this issue. According * This prevents the library from using shared in memory data. There are few ways to resolve this issue. According
@ -51,6 +44,13 @@ int main(int argc, char *argv[])
VAbstractApplication::SetICUData(argc, argv); VAbstractApplication::SetICUData(argc, argv);
#endif #endif
Q_INIT_RESOURCE(tapeicon);
Q_INIT_RESOURCE(theme);
Q_INIT_RESOURCE(icon);
Q_INIT_RESOURCE(schema);
Q_INIT_RESOURCE(flags);
Q_INIT_RESOURCE(style);
QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)

16
src/app/valentina/main.cpp
View File

@ -38,6 +38,14 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#if defined(APPIMAGE) && defined(Q_OS_LINUX)
/* When deploying with AppImage based on OpenSuse, the ICU library has a hardcoded path to the icudt*.dat file.
* This prevents the library from using shared in memory data. There are few ways to resolve this issue. According
* to documentation we can either use ICU_DATA environment variable or the function u_setDataDirectory().
*/
VAbstractApplication::SetICUData(argc, argv);
#endif
Q_INIT_RESOURCE(cursor); Q_INIT_RESOURCE(cursor);
Q_INIT_RESOURCE(icon); Q_INIT_RESOURCE(icon);
Q_INIT_RESOURCE(schema); Q_INIT_RESOURCE(schema);
@ -47,14 +55,6 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(toolicon); Q_INIT_RESOURCE(toolicon);
Q_INIT_RESOURCE(style); Q_INIT_RESOURCE(style);
#if defined(APPIMAGE) && defined(Q_OS_LINUX)
/* When deploying with AppImage based on OpenSuse, the ICU library has a hardcoded path to the icudt*.dat file.
* This prevents the library from using shared in memory data. There are few ways to resolve this issue. According
* to documentation we can either use ICU_DATA environment variable or the function u_setDataDirectory().
*/
VAbstractApplication::SetICUData(argc, argv);
#endif
QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)