Merge feature/qt6-migration-basis-modules-merge-viewer-validation into feature/migrate-lts-projects-and-application
Cherry-picks5501d1e50(stub-header updates, superseded by4223ca2ffrelocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.
This commit is contained in:
1295 files changed
+22136
-20217
No files matched your search
+3
@@ -12,6 +12,9 @@
|
||||
#include "esri_dictionary_processor.h"
|
||||
#include "advanced_symbology_logging.h"
|
||||
|
||||
// Qt
|
||||
#include <QUuid> // QUuid used in slot signatures / map keys (Qt6: no transitive include)
|
||||
|
||||
// Esri
|
||||
#include <DictionarySymbolStyle.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user