diff --git a/src/app/tape/main.cpp b/src/app/tape/main.cpp index 044abbbd5..34d95fdd5 100644 --- a/src/app/tape/main.cpp +++ b/src/app/tape/main.cpp @@ -36,13 +36,6 @@ 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) /* 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 @@ -51,6 +44,13 @@ int main(int argc, char *argv[]) VAbstractApplication::SetICUData(argc, argv); #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 #if defined(Q_OS_WIN) diff --git a/src/app/valentina/main.cpp b/src/app/valentina/main.cpp index fe53daa82..5cb372975 100644 --- a/src/app/valentina/main.cpp +++ b/src/app/valentina/main.cpp @@ -38,6 +38,14 @@ 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(icon); Q_INIT_RESOURCE(schema); @@ -47,14 +55,6 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(toolicon); 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 #if defined(Q_OS_WIN)