Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes
- Merged 292 changed files from dlbo snapshot - Fixed IDL enum collisions (PortType, PdmEventType) - Fixed Grantlee template for C++11 scoped enums - Fixed CMake VERSION_GREATER syntax - Added missing directories (THP, LtsRestClient, etc.) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
310 files changed
+2823
-740
No files matched your search
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
|
||||
#include <Core/pacemaker.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <Core/topic_lock_master.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <OperatorManagement/opm_dts.h>
|
||||
#include <OperatorManagement/opm_fts.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "handler_operator.h"
|
||||
#include <DDS/FTS/generic_fts_impl.h>
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
|
||||
#include <QMutableHashIterator>
|
||||
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include "logger.h"
|
||||
#include "opm_db.h"
|
||||
|
||||
#include <Core/core_fts_types.h>
|
||||
#include <Core/core_dts_types.h>
|
||||
#include <Core/topic_lock_master.h>
|
||||
#include <DDS/Core/core_fts_types.h>
|
||||
#include <DDS/Core/core_dts_types.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
#include <DDS/FTS/generic_fts_impl.h>
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "settings.h"
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <Core/pacemaker.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
|
||||
namespace OperatorManagement
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
|
||||
// Generated
|
||||
#include <OperatorManagement/opm_db.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
|
||||
// Generated
|
||||
#include <OperatorManagement/opm_db.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <Core/function_reply_object.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <QSet>
|
||||
|
||||
// Generated
|
||||
|
||||
Reference in new issue
Block a user