BUILD_RTI conditional fixes and Qt6 API updates
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found - cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed - Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI - Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI - Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals - cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return()) - Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc. - BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2065 files changed
+48219
-1763
No files matched your search
@@ -4,6 +4,8 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
MESSAGE(STATUS "DEBUG LTSWIDGETS TOP: BUILD_RTI=${BUILD_RTI}")
|
||||
|
||||
#
|
||||
# Lts Widgets library
|
||||
#
|
||||
@@ -147,6 +149,8 @@ NGL_WRAP_UI(ltswidgets_SRCS
|
||||
lts_date_time_edit_touch.ui
|
||||
)
|
||||
|
||||
MESSAGE(STATUS "DEBUG: After NGL_ADD_BIG_RESOURCES")
|
||||
|
||||
NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
|
||||
|
||||
MESSAGE(STATUS "DEBUG BEFORE IF: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}")
|
||||
@@ -159,6 +163,7 @@ IF(BUILD_RTI)
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QAbstractItemView>
|
||||
|
||||
@@ -87,7 +87,7 @@ LtsDialog::LtsDialog(QWidget *parent, ButtonCombination buttonCombination, bool
|
||||
|
||||
, m_buttonBox(nullptr)
|
||||
, m_uiRequirements(new UiRequirementList())
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsWidget.LtsDialog"))
|
||||
.getNGLLogger("LtsWidget.LtsDialog"))
|
||||
{
|
||||
Q_UNUSED(parent);
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
#ifndef LTSWIDGETS_EXPORT_H
|
||||
#define LTSWIDGETS_EXPORT_H
|
||||
|
||||
// Stub export header for BUILD_RTI=OFF case
|
||||
// When BUILD_RTI=ON, this file is generated by CMake's GENERATE_EXPORT_HEADER
|
||||
|
||||
#define LTSWIDGETS_EXPORT
|
||||
#define LTSWIDGETS_NO_EXPORT
|
||||
|
||||
#endif // LTSWIDGETS_EXPORT_H
|
||||
Reference in new issue
Block a user