test to fix checkboxes in combobox

3nids · 3nids · commit a95fedbbf005 · 2014-04-04T10:14:26.000+02:00
diff --git a/src/gui/qgsmaplayermodel.cpp b/src/gui/qgsmaplayermodel.cpp
@@ -148,7 +148,7 @@ QVariant QgsMapLayerModel::data( const QModelIndex &index, int role ) const
     return layer->id();
   }
 
-  if ( role == Qt::CheckStateRole )
+  if ( role == Qt::CheckStateRole && mItemCheckable )
   {
     QgsMapLayer* layer = static_cast<QgsMapLayer*>( index.internalPointer() );
     return mLayersChecked[layer->id()];

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ QVariant QgsMapLayerModel::data( const QModelIndex &index, int role ) const`
`148`	`148`	`return layer->id();`
`149`	`149`	`}`
`150`	`150`
`151`		`- if ( role == Qt::CheckStateRole )`
	`151`	`+ if ( role == Qt::CheckStateRole && mItemCheckable )`
`152`	`152`	`{`
`153`	`153`	`QgsMapLayer* layer = static_cast<QgsMapLayer*>( index.internalPointer() );`
`154`	`154`	`return mLayersChecked[layer->id()];`