Qt6 Migration: BUILD_RTI Guards, Export-Header und Include-Pfade korrigiert
- BUILD_RTI Guards in LtsSession implementiert (6 Dateien) - LtsSessionDataDds Stub für BUILD_RTI=OFF erstellt - Export-Header Stubs erstellt (GuezNasat, AlarmManagement, MarkerManagement) - Include-Pfade korrigiert (resource_path.h, logger.h, Proxies) - QStringRef → QString migriert (Qt6 Kompatibilität) - Qt6::Gui Dependencies hinzugefügt (LtsElevation, AdvancedSymbology) - FilterManagement-Plugins temporär vom Build ausgeschlossen - MOC-Probleme gefixt (staticMetaObject, override final) - Build erfolgreich: 1940 Targets mit BUILD_RTI=OFF im Docker-Container Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
46 files changed
+2487
-110
No files matched your search
+13
-3
@@ -11,12 +11,18 @@
|
||||
SET(mrk_common_gui_SRCS
|
||||
mrk_dialog_model.cpp
|
||||
mrk_dialog_model.h
|
||||
mrk_apply_filter.cpp
|
||||
mrk_apply_filter.h
|
||||
CustomViews/mrk_marker.cpp
|
||||
CustomViews/mrk_marker.h
|
||||
)
|
||||
|
||||
# FilterManagement-Plugins temporär ausgeschlossen für BUILD_RTI=OFF
|
||||
# if(BUILD_RTI)
|
||||
# list(APPEND mrk_common_gui_SRCS
|
||||
# mrk_apply_filter.cpp
|
||||
# mrk_apply_filter.h
|
||||
# )
|
||||
# endif()
|
||||
|
||||
NGL_WRAP_UI(mrk_common_gui_SRCS
|
||||
CustomViews/mrk_marker.ui
|
||||
)
|
||||
@@ -33,7 +39,6 @@ NGL_TARGET_LINK_LIBRARIES(MrkCommon
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
OpmDataPluginInterface
|
||||
FltDataPluginInterface
|
||||
ngltools
|
||||
PUBLIC
|
||||
MrkDataPluginInterface
|
||||
@@ -41,3 +46,8 @@ NGL_TARGET_LINK_LIBRARIES(MrkCommon
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
)
|
||||
|
||||
# FilterManagement nur bei BUILD_RTI
|
||||
if(BUILD_RTI)
|
||||
target_link_libraries(MrkCommon PRIVATE FltDataPluginInterface)
|
||||
endif()
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsDataView/abstract_display_widget.h>
|
||||
#include <abstract_display_widget.h>
|
||||
#include <mrkcommon_export.h>
|
||||
|
||||
namespace Ui
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
#include "mrk_dialog_model.h"
|
||||
#include <utility>
|
||||
#include <MarkerManagement/mrk_translation.h>
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
Reference in new issue
Block a user