diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f0d208e..9b50050f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(pfcrender) # The project version number. set(VERSION_MAJOR 0 CACHE STRING "Major version number.") -set(VERSION_MINOR 3 CACHE STRING "Minor version number.") +set(VERSION_MINOR 4 CACHE STRING "Minor version number.") set(VERSION_PATCH 0 CACHE STRING "Patch version number.") mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 27b61aff..77f805b2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,6 +54,7 @@ set(INC "QtGUI/PFCRender.h" + "projectinfo.h.in" ) #TODO: Split SRC and INC by common and GUI diff --git a/src/PFCStart.cpp b/src/PFCStart.cpp index 966c9653..62849a57 100644 --- a/src/PFCStart.cpp +++ b/src/PFCStart.cpp @@ -10,6 +10,8 @@ #include "Model/LSYSModel.h" #include "ViewModel/CustomGeometryModel.h" +#include "projectinfo.h" + int main(int argc, char** argv) { Plugins::Plugin_Registry* plugins = Plugins::Plugin_Registry::getInstance(); @@ -20,18 +22,24 @@ int main(int argc, char** argv) //XXX: For now, let's not mess with CLI mode #if 1 - qmlRegisterType("sci.pfcrender.customModel", 1, 0, "CustomGeometryModel"); + QGuiApplication app(argc,argv); +#else + QCoreApplication app(argc,argv); +#endif + //Set Version Information + app.setApplicationVersion(VERSION_STRING); - QGuiApplication app(argc,argv); - QQmlApplicationEngine qeng(QUrl(QStringLiteral("qrc:///main.qml"))); + //Register custom QML Types + qmlRegisterType("sci.pfcrender.customModel", 1, 0, "CustomGeometryModel"); + +#if 1 + QQmlApplicationEngine qeng(QUrl(QStringLiteral("qrc:///main.qml"))); QtGUI::PFCRender desktop_obj(&qeng); +#endif + return app.exec(); -#else - QCoreApplication qapp(argc,argv); - return qapp.exec(); -#endif }