From e71172fa39bd48642b2ddd1a2c16ed60c48343db Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 28 Nov 2025 14:52:49 +0100 Subject: [PATCH] Fix more qt 6.10 bugs --- .../cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp | 2 +- Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp index 1b0266dd36..58dc7a90f5 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp @@ -25,7 +25,7 @@ public: static int a = 0; id = a++; - name = QString( "Name %1" ).arg( id ); + name = QString( "Name %1" ).arg( id() ); } caf::PdmDataValueField name; diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp index 837cfb7921..49c3dd9ccd 100644 --- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp +++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp @@ -298,7 +298,7 @@ protected: uiOrdering.add( &m_doubleField ); uiOrdering.add( &m_intField ); - QString dynamicGroupName = QString( "Dynamic Group Text (%1)" ).arg( m_intField ); + QString dynamicGroupName = QString( "Dynamic Group Text (%1)" ).arg( m_intField() ); caf::PdmUiGroup* group = uiOrdering.addNewGroupWithKeyword( dynamicGroupName, "MyTest" ); group->add( &m_textField ); @@ -588,7 +588,7 @@ protected: uiOrdering.appendToRow( &m_intFieldRight ); uiOrdering.add( &m_intFieldWideBoth, { .totalColumnSpan = 4, .leftLabelColumnSpan = 2 } ); - QString dynamicGroupName = QString( "Dynamic Group Text (%1)" ).arg( m_intFieldStandard ); + QString dynamicGroupName = QString( "Dynamic Group Text (%1)" ).arg( m_intFieldStandard() ); caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Wide Group", { .totalColumnSpan = 4 } ); group->add( &m_intFieldWideBoth2, { .totalColumnSpan = 6, .leftLabelColumnSpan = 3 } );