From a327f38d5e37ae963701a203c6deffa253f61a9d Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Thu, 2 May 2024 15:56:56 +0300 Subject: [PATCH] QmlDesigner: Ignore Image cell warning for Url column Task-number: QDS-12157 Change-Id: Ia2a46ef878d522f6c5a08fb817c2ef1332cb113b Reviewed-by: Miikka Heikkinen Reviewed-by: Mahmoud Badri --- .../components/collectioneditor/collectiondetails.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp index 3ff37a6fc27..7e61f5e6100 100644 --- a/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp +++ b/src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp @@ -563,7 +563,10 @@ DataTypeWarning::Warning CollectionDetails::cellWarningCheck(int row, int column if ((columnType == DataType::String || columnType == DataType::Real) && cellType == DataType::Integer) return DataTypeWarning::Warning::None; - if ((columnType == DataType::Url || columnType == DataType::Image) && cellType == DataType::String) + if (columnType == DataType::Url && cellType == DataType::String) + return DataTypeWarning::Warning::None; + + if (columnType == DataType::Image && (cellType == DataType::Url || cellType == DataType::String)) return DataTypeWarning::Warning::None; if (columnType != cellType)