Adds latest migration results

This commit is contained in:
torsten committed 2026-09-01 12:27:57 +02:00
1 parent ad07345480
commit 0c1503d85c
829 files changed
+35074 -70886

No files matched your search

@@ -4,6 +4,14 @@
# $Author$
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
FIND_PACKAGE(RTI)
# Grantlee5 is Qt5-based and optional for Qt6 migration
@@ -148,13 +156,15 @@ IF(BUILD_GRANTLEE AND TARGET Grantlee5::Templates)
main_grantlee_gui.cpp
main_grantlee_gui.ui
)
NGL_TARGET_LINK_LIBRARIES(codegen_gui
codegen_grantlee
LtsCommandLineParser
nglapplication
Qt6::Widgets
Grantlee5::Templates
)
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(codegen_gui
codegen_grantlee
LtsCommandLineParser
nglapplication
${Qt6_Widgets}
Grantlee5::Templates
)
endif()
ELSE()
message(STATUS "BUILD_GRANTLEE disabled or Grantlee not found; skipping codegen_grantlee, ngl_codegen, and codegen_gui targets")
ENDIF()
@@ -1339,16 +1339,16 @@ StructBuilder::ServiceTypeStruct StructBuilder::extractServiceAndTypeFromTypenam
if (!extServiceRef.isEmpty())
{
if (extServiceRef.contains(QLatin1Char('<')))
ret.service = QString(extServiceRef).split(QLatin1Char('<')).at(1);
ret.service = extServiceRef.toString().split(QLatin1Char('<')).at(1);
else
ret.service = QString(extServiceRef);
ret.service = extServiceRef.toString();
}
if (!extTypeRef.isEmpty())
{
if (extTypeRef.contains(QLatin1Char('>')))
ret.type = QString(extTypeRef).split(QLatin1Char('>')).at(0);
ret.type = extTypeRef.toString().split(QLatin1Char('>')).at(0);
else
ret.type = QString(extTypeRef);
ret.type = extTypeRef.toString();
}
return ret;
}