Fix test crash.
--HG-- branch : develop
This commit is contained in:
parent
96df29144e
commit
76dd51b6c6
|
@ -29,8 +29,8 @@
|
||||||
#ifndef TESTVAPPLICATION_H
|
#ifndef TESTVAPPLICATION_H
|
||||||
#define TESTVAPPLICATION_H
|
#define TESTVAPPLICATION_H
|
||||||
|
|
||||||
#include "../vmisc/vabstractapplication.h"
|
#include "vabstractapplication.h"
|
||||||
#include "../vmisc/projectversion.h"
|
#include "projectversion.h"
|
||||||
|
|
||||||
#if defined(qApp)
|
#if defined(qApp)
|
||||||
#undef qApp
|
#undef qApp
|
|
@ -36,7 +36,8 @@ HEADERS += \
|
||||||
$$PWD/dialogs/dialogexporttocsv.h \
|
$$PWD/dialogs/dialogexporttocsv.h \
|
||||||
$$PWD/customevents.h \
|
$$PWD/customevents.h \
|
||||||
$$PWD/defglobal.h \
|
$$PWD/defglobal.h \
|
||||||
$$PWD/backport/qoverload.h
|
$$PWD/backport/qoverload.h \
|
||||||
|
$$PWD/testvapplication.h
|
||||||
|
|
||||||
# Qt's versions
|
# Qt's versions
|
||||||
# 5.2.0, 5.2.1
|
# 5.2.0, 5.2.1
|
||||||
|
|
|
@ -34,10 +34,11 @@
|
||||||
#include "tst_tstranslation.h"
|
#include "tst_tstranslation.h"
|
||||||
|
|
||||||
#include "../vmisc/def.h"
|
#include "../vmisc/def.h"
|
||||||
|
#include "../vmisc/testvapplication.h"
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
QApplication app( argc, argv );// For translation
|
TestVApplication app( argc, argv );// For QPrinter
|
||||||
|
|
||||||
int status = 0;
|
int status = 0;
|
||||||
auto ASSERT_TEST = [&status, argc, argv](QObject* obj)
|
auto ASSERT_TEST = [&status, argc, argv](QObject* obj)
|
||||||
|
|
|
@ -90,8 +90,7 @@ HEADERS += \
|
||||||
tst_readval.h \
|
tst_readval.h \
|
||||||
tst_vtranslatevars.h \
|
tst_vtranslatevars.h \
|
||||||
tst_vabstractpiece.h \
|
tst_vabstractpiece.h \
|
||||||
tst_vtooluniondetails.h \
|
tst_vtooluniondetails.h
|
||||||
testvapplication.h
|
|
||||||
|
|
||||||
# Set using ccache. Function enable_ccache() defined in common.pri.
|
# Set using ccache. Function enable_ccache() defined in common.pri.
|
||||||
$$enable_ccache()
|
$$enable_ccache()
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
|
|
||||||
#include "../vmisc/def.h"
|
#include "../vmisc/def.h"
|
||||||
#include "../qmuparser/qmudef.h"
|
#include "../qmuparser/qmudef.h"
|
||||||
#include "testvapplication.h"
|
#include "../vmisc/testvapplication.h"
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user