Index: main.cpp =================================================================== diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -rf623529d6ec25b555f3ac2248d71fc2b5e7063d6 --- main.cpp (.../main.cpp) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d) +++ main.cpp (.../main.cpp) (revision f623529d6ec25b555f3ac2248d71fc2b5e7063d6) @@ -23,7 +23,7 @@ // Qt #include #include -#include +#include #include // Project @@ -34,6 +34,10 @@ #include "guiglobals.h" #include "guicontroller.h" +#ifdef UNIT_TEST + #include "unittests/unittests.h" + QTEST_MAIN(unittests) +#else /*! \brief Application Initialization\n * Some part of the application need to be initialized out of any thread. * So is initialized here to be initialized in the main thread. @@ -45,22 +49,26 @@ // Qt Core Application parameters settings // Qt Core Application Initialization - QGuiApplication app(argc, argv); + QApplication app(argc, argv); QCoreApplication::setApplicationName(QLatin1String("Denali")); QCoreApplication::setOrganizationName(QLatin1String("Diality Inc.")); //! - Setting the application version regarding the Bamboo build number. QString ver_revis = QString("%1").arg(VER_REVIS); - if (ver_revis.isEmpty()) ver_revis = QString("%1").arg(VER_DEVEL); + if (ver_revis.isEmpty()) { + ver_revis = QString("%1").arg(VER_DEVEL); + } QCoreApplication::setApplicationVersion(QString("%1.%2.%3") .arg(VER_MAJOR) .arg(VER_MINOR) .arg(ver_revis)); //! - Translation initialization QTranslator translator; - if (translator.load(QLocale(), app.applicationName(), QLatin1String("_"), QLatin1String(":/translations"))) + bool trLoaded = translator.load(QLocale(), app.applicationName(), QLatin1String("_"), QLatin1String(":/translations")); + if (trLoaded) { app.installTranslator(&translator); + } //! - Initializing Main Timer _MainTimer->init(); @@ -74,7 +82,7 @@ //! - Initializing Application Controller _ApplicationController->init(); QObject::connect(_ApplicationController, &ApplicationController::quit, &app, [](int retcode) { - qDebug() << "Application Terminated:" << retcode; + //qDebug() << "Application Terminated:" << retcode; QCoreApplication::exit(retcode); }, Qt::QueuedConnection); @@ -86,3 +94,4 @@ return app.exec(); } +#endif