Merge feature/lift-lts-viewer-module-upto-qt6 into feature/regression-arcgis300-symbology-migration

- Integrated LTS viewer module with Qt6 migration
- Resolved all merge conflicts by keeping current branch versions
- Preserved existing Qt6 migration fixes

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.h

@@ -102,7 +102,7 @@ public:
   struct EsriSearch
   {
     mutable Esri::ArcGISRuntime::Symbol          *m_esriSymbol = nullptr;
-    mutable QUuid                                 m_esriTaskUuid;
+    mutable QFuture<QImage>                       m_swatchFuture;
     mutable QImage                                m_esriSwatch;
   };
   EsriSearch m_esriSearch;
@@ -112,15 +112,15 @@ public:
   struct EsriFetch
   {
     mutable QString                         m_sidc;
-    mutable QUuid                           m_esriFetchTaskIdUuid;
+    mutable QFuture<Esri::ArcGISRuntime::Symbol*> m_symbolFuture;
     Esri::ArcGISRuntime::Symbol            *m_esriSymbol = nullptr;
 
-    mutable QUuid                           m_esriSwatchTaskUuid;
+    mutable QFuture<QImage>                 m_swatchFuture;
     mutable QImage                          m_esriSwatch;
     mutable QImage                          m_esriToolTipSwatch;
   };
   EsriFetch m_esriFetch;
-  QImage getFetchSwatch() const;
+  QImage getFetchSwatch();
 
 
   ResultWatcherData                      *m_findBaseSymbolRWD = nullptr;

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.h

@@ -18,6 +18,7 @@
 #include <QtGui/QImage>
 #include <QtCore/QFutureWatcher>
 #include <QUuid>   // QUuid used in slot signatures / map keys (Qt6: no transitive include)
+#include <QFutureWatcher>
 
 
 // Esri
@@ -162,6 +163,7 @@ Q_SIGNALS:
 protected Q_SLOTS:
   void onSearchSymbolsCompletedPropertyTable(Esri::ArcGISRuntime::SymbolStyleSearchResultListModel *searchResults);
   void onEsriSymbolSwatchCompleted(const QUuid &csTaskId, const QImage &image);
+  void onSymbolFetched(int taskIndex);
 
 
 protected:
@@ -187,18 +189,31 @@ protected:
   // originalKey
   struct EsriSymbol
   {
-    Esri::ArcGISRuntime::SymbolStyleSearchResult  m_sssResult;
-    mutable Esri::ArcGISRuntime::Symbol          *esriSymbol = nullptr;
-    mutable QImage                                swatchImage;
+    QString     key;           // Key to fetch symbol via fetchSymbolAsync()
+    mutable Esri::ArcGISRuntime::Symbol *esriSymbol = nullptr;
+    mutable QImage            swatchImage;
   };
   QHash<QString, EsriSymbol>                          m_originalKeyToEsriSymbol;
 
   // symbolPropertyImage-Uuid -> SymbolResult
   mutable QMap<QUuid, QWeakPointer<SymbolResult>>     m_symbolPropertyImage2symbolResult;
 
+  // Track swatch QFutureWatchers to manage lifecycle
+  mutable QList<QFutureWatcher<QImage>*>              m_swatchWatchers;
+
+  // Helper struct to track symbol fetch tasks for on-demand symbol creation
+  struct SymbolFetchTask
+  {
+    QFutureWatcher<Esri::ArcGISRuntime::Symbol*> watcher;
+    QString key;                    // Original key for lookup
+    QWeakPointer<SymbolResult> symbolResult;
+    QUuid csTaskId;                 // Swatch task ID (for chaining)
+  };
+  mutable QList<SymbolFetchTask*>                     m_symbolFetchTasks;
+
 public:
   bool symbolPropertyImageContains(const QString &originalKey) const;
-  QSharedPointer<SymbolResult> symbolPropertyImage(QSharedPointer<SymbolResult> symResult, const QString &originalKey) const;
+  QSharedPointer<SymbolResult> symbolPropertyImage(QSharedPointer<SymbolResult> symResult, const QString &originalKey);
 
   const QList<Esri::ArcGISRuntime::SymbolStyleSearchResult> & getSearchResultList() const { return m_searchResultList; }
   const QList<Esri::ArcGISRuntime::SymbolStyleSearchResult> & getSearchResultListValid() const { return m_searchResultListValid; }

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6d.cpp

@@ -40,7 +40,6 @@
 
 
 
-#include <arcgisversion.h>  // This file is created by RME, not ESRI
 
 
 namespace AdvancedSymbology