Fix test crash.
--HG-- branch : develop
This commit is contained in:
parent
f7e8b10407
commit
96df29144e
|
@ -30,19 +30,27 @@
|
||||||
#define TESTVAPPLICATION_H
|
#define TESTVAPPLICATION_H
|
||||||
|
|
||||||
#include "../vmisc/vabstractapplication.h"
|
#include "../vmisc/vabstractapplication.h"
|
||||||
|
#include "../vmisc/projectversion.h"
|
||||||
|
|
||||||
#if defined(qApp)
|
#if defined(qApp)
|
||||||
#undef qApp
|
#undef qApp
|
||||||
#endif
|
#endif
|
||||||
#define qApp (static_cast<TestVApplication*>(QCoreApplication::instance()))
|
#define qApp (static_cast<TestVApplication*>(QCoreApplication::instance()))
|
||||||
|
|
||||||
|
class VTestSettings;
|
||||||
|
|
||||||
class TestVApplication : public VAbstractApplication
|
class TestVApplication : public VAbstractApplication
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TestVApplication(int &argc, char ** argv)
|
TestVApplication(int &argc, char ** argv)
|
||||||
: VAbstractApplication(argc, argv),
|
: VAbstractApplication(argc, argv),
|
||||||
m_trVars(nullptr)
|
m_trVars(nullptr)
|
||||||
{}
|
{
|
||||||
|
setApplicationName("ValentinaTest");
|
||||||
|
setOrganizationName(VER_COMPANYNAME_STR);
|
||||||
|
|
||||||
|
OpenSettings();
|
||||||
|
}
|
||||||
|
|
||||||
virtual ~TestVApplication() Q_DECL_EQ_DEFAULT;
|
virtual ~TestVApplication() Q_DECL_EQ_DEFAULT;
|
||||||
|
|
||||||
|
@ -52,7 +60,10 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OpenSettings() Q_DECL_OVERRIDE
|
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
|
virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE
|
||||||
{
|
{
|
||||||
|
@ -71,5 +82,16 @@ private:
|
||||||
VTranslateVars *m_trVars;
|
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>("QMarginsF");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // TESTVAPPLICATION_H
|
||||||
|
|
Loading…
Reference in New Issue
Block a user