Remove 'VERSION' in project file ...

'VERSION' conflicts with 'EXTRA_QMAKEVARS_PRE' in yocto recipe.
Initialize TimeBase multimap.
2024-01-22 10:50:59 +01:00 · 2024-01-22 10:24:32 +01:00 · 2024-01-22 10:23:41 +01:00
3 changed files with 4 additions and 2 deletions
--- a/library/include/mobilisis/configuration.h
+++ b/library/include/mobilisis/configuration.h
@@ -49,6 +49,7 @@ public:
    multimap<int, ATBDailyTicket> DailyTicket;
    multimap<int, ATBTimeRange> TimeRange;
    multimap<int, ATBTimeStepConfig> TimeStepConfig;
+    multimap<int, ATBTimeBase> TimeBase;

 	/// <summary>
 	/// Parse JSON string
--- a/library/library.pro
+++ b/library/library.pro
@@ -9,7 +9,8 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis
 INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson

 #start version with project neuhauser/galtuer
-VERSION=1.0.0
+#Version is set in yocto recipe with "EXTRA_QMAKEVARS_PRE"
+#VERSION=1.0.0

 CONFIG(debug, debug|release) {
    win32 {
--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
@@ -417,7 +417,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                    break;
                case MemberType::TimeBaseType:
                    // qCritical() << TimeBase;
-                    cfg->TimeBase.insert(pair<int, ATBTimeRange>(TimeBase.tbase_id, TimeBase));
+                    cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
                    break;
                case MemberType::TimeRangeType:
                    // qCritical() << TimeRange;
Author	SHA1	Message	Date
Siegfried Siegert	7679eb9481	Remove 'VERSION' in project file ... 'VERSION' conflicts with 'EXTRA_QMAKEVARS_PRE' in yocto recipe.	2024-01-22 10:50:59 +01:00
Gerhard Hoffmann	a8de97a528	Initialize TimeBase multimap.	2024-01-22 10:24:32 +01:00
Gerhard Hoffmann	ed6592c273	Add: multimap<int, ATBTimeBase> TimeBase	2024-01-22 10:23:41 +01:00