u_setDataDirectory to define path to ICU data.

--HG--
branch : develop

src/app/tape/main.cpp

@@ -43,9 +43,7 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(flags);
     Q_INIT_RESOURCE(style);
 
-    QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
-
-#if defined(APPIMAGE)
     /* 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().
@@ -53,6 +51,8 @@ int main(int argc, char *argv[])
     VAbstractApplication::SetICUData(argc, argv);
 #endif
 
+    QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations
+
 #if defined(Q_OS_WIN)
     VAbstractApplication::WinAttachConsole();
 #endif
@@ -64,8 +64,6 @@ int main(int argc, char *argv[])
     MApplication app(argc, argv);
     app.InitOptions();
 
-    qDebug() << "ICU_DATA: " << qgetenv("ICU_DATA");
-
     if (FvUpdater::IsStaledTestBuild())
     {
         qWarning() << QApplication::translate("Tape",

src/app/tape/tape.pro

@@ -430,6 +430,10 @@ else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpro
 INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
 DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
 
+contains(DEFINES, APPIMAGE) {
+    unix:!macx: LIBS += -licudata -licui18n -licuuc
+}
+
 noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
     # do nothing
 } else {

src/app/valentina/main.cpp

@@ -47,9 +47,7 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(toolicon);
     Q_INIT_RESOURCE(style);
 
-    QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
-
-#if defined(APPIMAGE)
     /* 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().
@@ -57,6 +55,8 @@ int main(int argc, char *argv[])
     VAbstractApplication::SetICUData(argc, argv);
 #endif
 
+    QT_REQUIRE_VERSION(argc, argv, "5.4.0")// clazy:exclude=qstring-arg,qstring-allocations
+
 #if defined(Q_OS_WIN)
     VAbstractApplication::WinAttachConsole();
 #endif
@@ -73,8 +73,6 @@ int main(int argc, char *argv[])
     VApplication app(argc, argv);
     app.InitOptions();
 
-    qDebug() << "ICU_DATA: " << qgetenv("ICU_DATA");
-
     if (FvUpdater::IsStaledTestBuild())
     {
         qWarning() << QApplication::translate("Valentina",

src/app/valentina/valentina.pro

@@ -682,6 +682,10 @@ else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpro
 INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
 DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
 
+contains(DEFINES, APPIMAGE) {
+    unix:!macx: LIBS += -licudata -licui18n -licuuc
+}
+
 noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
     # do nothing
 } else {

src/libs/vmisc/vabstractapplication.cpp

@@ -49,9 +49,14 @@
 #  include <unistd.h>
 #endif
 
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
+#   include "unicode/putil.h"
+#endif
+
 namespace
 {
-QString ApplicationFilePath(int &argc, char **argv)
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
+QString ApplicationFilePath(const int &argc, char **argv)
 {
     if (argc)
     {
@@ -109,6 +114,7 @@ QString ApplicationFilePath(int &argc, char **argv)
 #endif
     return QString();
 }
+#endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
 }
 
 const QString VAbstractApplication::patternMessageSignature = QStringLiteral("[PATTERN MESSAGE]");
@@ -340,6 +346,7 @@ bool VAbstractApplication::IsPatternMessage(const QString &message) const
     return VAbstractApplication::ClearMessage(message).startsWith(patternMessageSignature);
 }
 
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
 //---------------------------------------------------------------------------------------------------------------------
 void VAbstractApplication::SetICUData(int &argc, char **argv)
 {
@@ -348,8 +355,9 @@ void VAbstractApplication::SetICUData(int &argc, char **argv)
      * to documentation we can either use ICU_DATA environment variable or the function u_setDataDirectory().
      */
     const QString appDirPath = QFileInfo(ApplicationFilePath(argc, argv)).path();
-    qputenv("ICU_DATA", QString(appDirPath + QStringLiteral("/../share/icu")).toUtf8());
+    u_setDataDirectory(QString(appDirPath + QStringLiteral("/../share/icu")).toUtf8());
 }
+#endif // defined(Q_OS_LINUX)
 
 //---------------------------------------------------------------------------------------------------------------------
 #if defined(Q_OS_WIN)

src/libs/vmisc/vabstractapplication.h

@@ -129,7 +129,9 @@ public:
     static const QString patternMessageSignature;
     bool IsPatternMessage(const QString &message) const;
 
+#if defined(APPIMAGE) && defined(Q_OS_LINUX)
     static void SetICUData(int &argc, char ** argv);
+#endif
 
 protected:
     QUndoStack         *undoStack;

src/test/CollectionTest/CollectionTest.pro

@@ -188,6 +188,10 @@ else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpro
 INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
 DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
 
+contains(DEFINES, APPIMAGE) {
+    unix:!macx: LIBS += -licudata -licui18n -licuuc
+}
+
 TAPE_TEST_FILES += \
     tst_tape/keiko.vit \
     tst_tape/empty.vit \

src/test/TranslationsTest/TranslationsTest.pro

@@ -163,3 +163,7 @@ else:unix: LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser
 
 INCLUDEPATH += $${PWD}/../../libs/qmuparser
 DEPENDPATH += $${PWD}/../../libs/qmuparser
+
+contains(DEFINES, APPIMAGE) {
+    unix:!macx: LIBS += -licudata -licui18n -licuuc
+}

src/test/ValentinaTest/ValentinaTest.pro

@@ -226,6 +226,10 @@ else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpro
 INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
 DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
 
+contains(DEFINES, APPIMAGE) {
+    unix:!macx: LIBS += -licudata -licui18n -licuuc
+}
+
 DATA_RESOURCE = share/test_data.qrc # External Binary Resource
 
 !exists($${OUT_PWD}/$${DESTDIR}/test_data.rcc) {