Merge remote-tracking branch 'origin/patch_2021.10.3' into dev

This commit is contained in:
Magne Sjaastad
2022-03-28 09:06:38 +02:00
17 changed files with 164 additions and 31 deletions

View File

@@ -20,6 +20,8 @@
#include "RiaDefines.h"
#include "RiaResultNames.h"
#include "cafAppEnum.h"
namespace caf
@@ -162,7 +164,8 @@ void caf::AppEnum<RiaDefines::RowCount>::setUp()
//--------------------------------------------------------------------------------------------------
bool RiaDefines::isNativeCategoryResult( const QString& resultName )
{
return resultName.endsWith( "NUM" );
return resultName.endsWith( "NUM" ) || resultName == RiaResultNames::indexIResultName() ||
resultName == RiaResultNames::indexJResultName() || resultName == RiaResultNames::indexKResultName();
}
//--------------------------------------------------------------------------------------------------