Qt6 Migration: LtsWidgets, BUILD_RTI Guards, externe Dependencies dokumentiert
- LtsWidgets Verzeichnis vollständig migriert (Qt5→Qt6) - BUILD_RTI Guards für RTI-spezifische Module hinzugefügt - Externe Dependencies in EXTERNAL_DEPS.md dokumentiert - Qt6 API-Änderungen: QRegExp→QRegularExpression, enterEvent(QEnterEvent*) - AutoUic-Fehler bei ui_requirement behoben (SKIP_AUTOUIC) - Include-Pfade korrigiert (LtsElevation, LtsMultiMonitor, LtsUtilsCore) - MOC-Fehler behoben (Q_INTERFACES entfernt wo nicht benötigt) - CMakeLists.txt Anpassungen für Qt6 (PUBLIC statt INTERFACE) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
145 files changed
+17700
-14377
No files matched your search
@@ -4,8 +4,6 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
MESSAGE(STATUS "DEBUG LTSWIDGETS TOP: BUILD_RTI=${BUILD_RTI}")
|
||||
|
||||
#
|
||||
# Lts Widgets library
|
||||
#
|
||||
@@ -75,8 +73,8 @@ SET(ltswidgets_SRCS
|
||||
lts_image_editor.h
|
||||
lts_led_widget.cpp
|
||||
lts_led_widget.h
|
||||
requirement_widget.cpp
|
||||
requirement_widget.h
|
||||
ui_requirement.cpp
|
||||
ui_requirement.h
|
||||
#lts_widgets_export.h
|
||||
lts_picture_view.cpp
|
||||
lts_picture_view.h
|
||||
@@ -113,8 +111,6 @@ SET(ltswidgets_SRCS
|
||||
LtsImageCropper/lts_image_cropper.cpp
|
||||
)
|
||||
|
||||
# requirement_widget.h renamed from ui_requirement.h to avoid AutoUIC scanning
|
||||
|
||||
|
||||
#if (TABLET_MODE)
|
||||
# LIST(APPEND ltswidgets_SRCS
|
||||
@@ -146,27 +142,18 @@ NGL_WRAP_UI(ltswidgets_SRCS
|
||||
lts_text_editor.ui
|
||||
lts_notification_box.ui
|
||||
lts_angle_edit.ui
|
||||
lts_date_time_edit_touch.ui
|
||||
# lts_date_time_edit_touch.ui
|
||||
)
|
||||
|
||||
MESSAGE(STATUS "DEBUG: After NGL_ADD_BIG_RESOURCES")
|
||||
# ui_requirement.cpp/h sind normale C++ Dateien, keine UI-Dateien
|
||||
# SKIP_AUTOUIC verhindert dass CMake nach requirement.ui sucht
|
||||
set_source_files_properties(ui_requirement.cpp PROPERTIES SKIP_AUTOUIC ON)
|
||||
|
||||
NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
|
||||
NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
|
||||
|
||||
MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
|
||||
|
||||
# Define MAKE_LTSWIDGETS_LIB for proper symbol export
|
||||
ADD_DEFINITIONS(-DMAKE_LTSWIDGETS_LIB)
|
||||
|
||||
NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
# Qt6 Dependencies immer setzen (auch wenn BUILD_RTI=OFF)
|
||||
# Die Library wird gebaut, aber nur bei BUILD_RTI=ON installiert/verwendet
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
PRIVATE
|
||||
Qt6::Network # for QHostInfo - for portability
|
||||
@@ -184,34 +171,42 @@ NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
Qt6::Gui
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(LtsWidgets)
|
||||
ENDIF()
|
||||
|
||||
#
|
||||
# Designer-Plugin (RTI-dependent)
|
||||
# Designer-Plugin
|
||||
#
|
||||
IF(BUILD_RTI)
|
||||
SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
|
||||
NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
|
||||
NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
|
||||
NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
|
||||
SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
|
||||
NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
|
||||
NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
|
||||
NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
|
||||
ENDIF()
|
||||
|
||||
IF(BUILD_TESTING)
|
||||
# picture_editing_test
|
||||
SET(pet_SRCS
|
||||
tests/lts_picture_editing.cpp
|
||||
tests/lts_picture_editing.h
|
||||
tests/lts_picture_editing_main.cpp
|
||||
)
|
||||
NGL_WRAP_UI(pet_SRCS
|
||||
tests/lts_picture_editing.ui
|
||||
)
|
||||
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION picture_editing_test ${pet_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(picture_editing_test
|
||||
LtsWidgets
|
||||
)
|
||||
|
||||
IF(BUILD_TESTING)
|
||||
# picture_editing_test
|
||||
SET(pet_SRCS
|
||||
tests/lts_picture_editing.cpp
|
||||
tests/lts_picture_editing.h
|
||||
tests/lts_picture_editing_main.cpp
|
||||
)
|
||||
NGL_WRAP_UI(pet_SRCS
|
||||
tests/lts_picture_editing.ui
|
||||
)
|
||||
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION picture_editing_test ${pet_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(picture_editing_test
|
||||
LtsWidgets
|
||||
)
|
||||
ENDIF()
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
# # LtsWidgetsTest
|
||||
# SET(src_test
|
||||
@@ -224,3 +219,4 @@ ENDIF(BUILD_RTI)
|
||||
# NGL_TARGET_LINK_LIBRARIES(LtsWidgetsTest
|
||||
# LtsWidgets
|
||||
# )
|
||||
ENDIF()
|
||||
Reference in new issue
Block a user