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

QCoreApplication::applicationDirPath returns empty string until we do not init

Browse Source 
QApplication instance.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-11-26 16:44:52 +02:00
parent b724210bf9
commit f81d814bb2
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@
#include "../fervor/fvupdater.h" #include "../fervor/fvupdater.h"
#include "../vmisc/vsysexits.h" #include "../vmisc/vsysexits.h"
#include <QtGlobal>
#include <QMessageBox> // For QT_REQUIRE_VERSION #include <QMessageBox> // For QT_REQUIRE_VERSION
#include <QTimer> #include <QTimer>
@ -46,14 +45,6 @@ int main(int argc, char *argv[])
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(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().
*/
qputenv("ICU_DATA", QString(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/icu")).toUtf8());
#endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
VAbstractApplication::WinAttachConsole(); VAbstractApplication::WinAttachConsole();
#endif #endif

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

@ -31,7 +31,6 @@
#include "../fervor/fvupdater.h" #include "../fervor/fvupdater.h"
#include "../vpatterndb/vpiecenode.h" #include "../vpatterndb/vpiecenode.h"
#include <QtGlobal>
#include <QMessageBox> // For QT_REQUIRE_VERSION #include <QMessageBox> // For QT_REQUIRE_VERSION
#include <QTimer> #include <QTimer>
@ -50,14 +49,6 @@ int main(int argc, char *argv[])
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(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().
*/
qputenv("ICU_DATA", QString(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/icu")).toUtf8());
#endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
VAbstractApplication::WinAttachConsole(); VAbstractApplication::WinAttachConsole();
#endif #endif
@ -72,7 +63,6 @@ int main(int argc, char *argv[])
#endif //Q_OS_MAC #endif //Q_OS_MAC
VApplication app(argc, argv); VApplication app(argc, argv);
app.InitOptions(); app.InitOptions();
qDebug() << "ICU_DATA: " << qgetenv("ICU_DATA"); qDebug() << "ICU_DATA: " << qgetenv("ICU_DATA");

8
src/libs/vmisc/vabstractapplication.cpp
View File

@ -68,6 +68,14 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
openingPattern(false), openingPattern(false),
mode(Draw::Calculation) mode(Draw::Calculation)
{ {
#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().
*/
qputenv("ICU_DATA", QString(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/icu")).toUtf8());
#endif
QString rules; QString rules;
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 1) #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 1)