src/app/qgsvectorlayerproperties.cpp

@@ -126,6 +126,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   }
   else
   {
+    labelingDialog = 0;
+    labelDialog = 0;
     tabWidget->setTabEnabled( 1, false ); // hide labeling item
     tabWidget->setTabEnabled( 2, false ); // hide labeling (deprecated) item
   }
@@ -705,7 +707,8 @@ QgsVectorLayer::EditType QgsVectorLayerProperties::editTypeFromButtonText( QStri
 
 void QgsVectorLayerProperties::apply()
 {
-  labelingDialog->apply();
+  if ( labelingDialog )
+    labelingDialog->apply();
 
   //
   // Set up sql subset query if applicable
@@ -749,7 +752,8 @@ void QgsVectorLayerProperties::apply()
 
   actionDialog->apply();
 
-  labelDialog->apply();
+  if ( labelDialog )
+    labelDialog->apply();
   layer->enableLabels( labelCheckBox->isChecked() );
   layer->setLayerName( displayName() );
 

src/core/raster/qgsrasteriterator.h

@@ -57,6 +57,7 @@ class CORE_EXPORT QgsRasterIterator
        @param bandNumber band to read
        @param nCols number of columns on output device
        @param nRows number of rows on output device
+       @param block address of block pointer
        @param topLeftCol top left column
        @param topLeftRow top left row
        @return false if the last part was already returned*/

src/providers/wms/qgstilescalewidget.cpp

@@ -158,7 +158,7 @@ void QgsTileScaleWidget::showTileScale( QMainWindow *mainWindow )
 
   dock->setWidget( tws );
 
-  connect( dock->toggleViewAction(), SIGNAL( triggered( bool ) ), tws, SLOT( scaleEnabled( bool ) ) );
+  connect( dock, SIGNAL( visibilityChanged( bool ) ), tws, SLOT( scaleEnabled( bool ) ) );
 
   QSettings settings;
   dock->setVisible( settings.value( "/UI/tileScaleEnabled", false ).toBool() );