diff --git a/src/test/ValentinaTest/testvapplication.h b/src/libs/vmisc/testvapplication.h similarity index 97% rename from src/test/ValentinaTest/testvapplication.h rename to src/libs/vmisc/testvapplication.h index 88cfb39df..deb3dcbbf 100644 --- a/src/test/ValentinaTest/testvapplication.h +++ b/src/libs/vmisc/testvapplication.h @@ -29,8 +29,8 @@ #ifndef TESTVAPPLICATION_H #define TESTVAPPLICATION_H -#include "../vmisc/vabstractapplication.h" -#include "../vmisc/projectversion.h" +#include "vabstractapplication.h" +#include "projectversion.h" #if defined(qApp) #undef qApp diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri index e207961a2..46605a9e8 100644 --- a/src/libs/vmisc/vmisc.pri +++ b/src/libs/vmisc/vmisc.pri @@ -36,7 +36,8 @@ HEADERS += \ $$PWD/dialogs/dialogexporttocsv.h \ $$PWD/customevents.h \ $$PWD/defglobal.h \ - $$PWD/backport/qoverload.h + $$PWD/backport/qoverload.h \ + $$PWD/testvapplication.h # Qt's versions # 5.2.0, 5.2.1 diff --git a/src/test/TranslationsTest/qttestmainlambda.cpp b/src/test/TranslationsTest/qttestmainlambda.cpp index c715e39d5..8ecfec2be 100644 --- a/src/test/TranslationsTest/qttestmainlambda.cpp +++ b/src/test/TranslationsTest/qttestmainlambda.cpp @@ -34,10 +34,11 @@ #include "tst_tstranslation.h" #include "../vmisc/def.h" +#include "../vmisc/testvapplication.h" int main(int argc, char** argv) { - QApplication app( argc, argv );// For translation + TestVApplication app( argc, argv );// For QPrinter int status = 0; auto ASSERT_TEST = [&status, argc, argv](QObject* obj) diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 4af00d0aa..69d2fd1ea 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -90,8 +90,7 @@ HEADERS += \ tst_readval.h \ tst_vtranslatevars.h \ tst_vabstractpiece.h \ - tst_vtooluniondetails.h \ - testvapplication.h + tst_vtooluniondetails.h # Set using ccache. Function enable_ccache() defined in common.pri. $$enable_ccache() diff --git a/src/test/ValentinaTest/qttestmainlambda.cpp b/src/test/ValentinaTest/qttestmainlambda.cpp index 789db2aaa..92a3da31d 100644 --- a/src/test/ValentinaTest/qttestmainlambda.cpp +++ b/src/test/ValentinaTest/qttestmainlambda.cpp @@ -53,7 +53,7 @@ #include "../vmisc/def.h" #include "../qmuparser/qmudef.h" -#include "testvapplication.h" +#include "../vmisc/testvapplication.h" //--------------------------------------------------------------------------------------------------------------------- int main(int argc, char** argv)