From 96df29144e5aca7a2c5c266b8b8f3f03af49be8a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 21 Jan 2018 18:41:30 +0200 Subject: [PATCH] Fix test crash. --HG-- branch : develop --- src/test/ValentinaTest/testvapplication.h | 28 ++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/test/ValentinaTest/testvapplication.h b/src/test/ValentinaTest/testvapplication.h index 27786ccb1..88cfb39df 100644 --- a/src/test/ValentinaTest/testvapplication.h +++ b/src/test/ValentinaTest/testvapplication.h @@ -30,19 +30,27 @@ #define TESTVAPPLICATION_H #include "../vmisc/vabstractapplication.h" +#include "../vmisc/projectversion.h" #if defined(qApp) #undef qApp #endif #define qApp (static_cast(QCoreApplication::instance())) +class VTestSettings; + class TestVApplication : public VAbstractApplication { public: TestVApplication(int &argc, char ** argv) : VAbstractApplication(argc, argv), m_trVars(nullptr) - {} + { + setApplicationName("ValentinaTest"); + setOrganizationName(VER_COMPANYNAME_STR); + + OpenSettings(); + } virtual ~TestVApplication() Q_DECL_EQ_DEFAULT; @@ -52,7 +60,10 @@ public: } virtual void OpenSettings() Q_DECL_OVERRIDE - {} + { + settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), + QCoreApplication::applicationName(), this); + } virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE { @@ -71,5 +82,16 @@ private: VTranslateVars *m_trVars; }; -#endif // TESTVAPPLICATION_H +class VTestSettings : public VCommonSettings +{ + Q_OBJECT +public: + VTestSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(), + QObject *parent = nullptr) + : VCommonSettings(format, scope, organization, application, parent) + { + qRegisterMetaTypeStreamOperators("QMarginsF"); + } +}; +#endif // TESTVAPPLICATION_H