doc/CONTRIBUTORS

@@ -4,7 +4,6 @@
 # feedback, reviews and/or many other things that have aided the development of
 # QGIS:
 #
-Alexander Bruy
 Andres Manz
 Anita Graser
 Arthur Nanni

python/plugins/fTools/tools/doIntersectLines.py

@@ -51,12 +51,12 @@ def __init__(self, iface):
 
     def populateLayers( self ):
         layers = ftools_utils.getLayerNames([QGis.Line])
-        QObject.disconnect(self.inLine1, SIGNAL("currentIndexChanged(QString)"), self.update1)
-        QObject.disconnect(self.inLine2, SIGNAL("currentIndexChanged(QString)"), self.update2)
+        self.inLine1.blockSignals( True )
+        self.inLine2.blockSignals( True )
         self.inLine1.clear()
         self.inLine2.clear()
-        QObject.connect(self.inLine1, SIGNAL("currentIndexChanged(QString)"), self.update1)
-        QObject.connect(self.inLine2, SIGNAL("currentIndexChanged(QString)"), self.update2)
+        self.inLine1.blockSignals( False )
+        self.inLine2.blockSignals( False )
         self.inLine1.addItems(layers)
         self.inLine2.addItems(layers)
 

src/app/qgisapp.cpp

@@ -5734,9 +5734,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
       //start editing/stop editing
       if ( dprovider->capabilities() & QgsVectorDataProvider::EditingCapabilities )
       {
-        mActionToggleEditing->setEnabled( !vlayer->isReadOnly() );
+        bool canChangeAttributes = dprovider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues;
+        mActionToggleEditing->setEnabled( canChangeAttributes && !vlayer->isReadOnly() );
         mActionToggleEditing->setChecked( vlayer->isEditable() );
-        mActionSaveEdits->setEnabled( vlayer->isEditable() );
+        mActionSaveEdits->setEnabled( canChangeAttributes && vlayer->isEditable() );
       }
       else
       {

src/app/qgswmssourceselect.cpp

@@ -553,7 +553,7 @@ void QgsWMSSourceSelect::enableLayersForCrs( QTreeWidgetItem *item )
   if ( !layerName.isEmpty() && styleName.isEmpty() )
   {
     // layer
-    bool disable = !item->data( 0, Qt::UserRole + 2 ).toStringList().contains( mCRS );
+    bool disable = !item->data( 0, Qt::UserRole + 2 ).toStringList().contains( mCRS, Qt::CaseInsensitive );
 
     item->setDisabled( disable );