src/app/qgsoptions.cpp

@@ -373,6 +373,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   cbxCreateRasterLegendIcons->setChecked( settings.value( "/qgis/createRasterLegendIcons", true ).toBool() );
   cbxCopyWKTGeomFromTable->setChecked( settings.value( "/qgis/copyGeometryAsWKT", true ).toBool() );
   leNullValue->setText( settings.value( "qgis/nullValue", "NULL" ).toString() );
+  cbxIgnoreShapeEncoding->setChecked( settings.value( "/qgis/ignoreShapeEncoding", false ).toBool() );
 
   cmbLegendDoubleClickAction->setCurrentIndex( settings.value( "/qgis/legendDoubleClickAction", 0 ).toInt() );
 
@@ -810,6 +811,7 @@ void QgsOptions::saveOptions()
                      cmbScanItemsInBrowser->itemData( cmbScanItemsInBrowser->currentIndex() ).toString() );
   settings.setValue( "/qgis/scanZipInBrowser",
                      cmbScanZipInBrowser->itemData( cmbScanZipInBrowser->currentIndex() ).toString() );
+  settings.setValue( "/qgis/ignoreShapeEncoding", cbxIgnoreShapeEncoding->isChecked() );
   settings.setValue( "/qgis/dockIdentifyResults", cbxIdentifyResultsDocked->isChecked() );
   settings.setValue( "/qgis/dockSnapping", cbxSnappingOptionsDocked->isChecked() );
   settings.setValue( "/qgis/addPostgisDC", cbxAddPostgisDC->isChecked() );

src/gui/qgsrasterlayersaveasdialog.h

@@ -61,23 +61,23 @@ class GUI_EXPORT QgsRasterLayerSaveAsDialog: public QDialog, private Ui::QgsRast
     void on_mCurrentExtentButton_clicked();
     void on_mOriginalExtentButton_clicked();
     void on_mFormatComboBox_currentIndexChanged( const QString& text );
-    void on_mResolutionRadioButton_toggled( bool checked ) { toggleResolutionSize(); }
+    void on_mResolutionRadioButton_toggled( bool ) { toggleResolutionSize(); }
     void on_mOriginalResolutionPushButton_clicked() { setOriginalResolution(); }
-    void on_mXResolutionLineEdit_textEdited( const QString & text ) { mResolutionState = UserResolution; recalcSize(); }
-    void on_mYResolutionLineEdit_textEdited( const QString & text ) { mResolutionState = UserResolution; recalcSize(); }
+    void on_mXResolutionLineEdit_textEdited( const QString & ) { mResolutionState = UserResolution; recalcSize(); }
+    void on_mYResolutionLineEdit_textEdited( const QString & ) { mResolutionState = UserResolution; recalcSize(); }
 
     void on_mOriginalSizePushButton_clicked() { setOriginalSize(); }
-    void on_mColumnsLineEdit_textEdited( const QString & text ) { mResolutionState = UserResolution; recalcResolution(); }
-    void on_mRowsLineEdit_textEdited( const QString & text ) { mResolutionState = UserResolution; recalcResolution(); }
+    void on_mColumnsLineEdit_textEdited( const QString & ) { mResolutionState = UserResolution; recalcResolution(); }
+    void on_mRowsLineEdit_textEdited( const QString & ) { mResolutionState = UserResolution; recalcResolution(); }
 
-    void on_mXMinLineEdit_textEdited( const QString & text ) { mExtentState = UserExtent; extentChanged(); }
-    void on_mXMaxLineEdit_textEdited( const QString & text ) { mExtentState = UserExtent; extentChanged(); }
-    void on_mYMinLineEdit_textEdited( const QString & text ) { mExtentState = UserExtent; extentChanged(); }
-    void on_mYMaxLineEdit_textEdited( const QString & text ) { mExtentState = UserExtent; extentChanged(); }
+    void on_mXMinLineEdit_textEdited( const QString & ) { mExtentState = UserExtent; extentChanged(); }
+    void on_mXMaxLineEdit_textEdited( const QString & ) { mExtentState = UserExtent; extentChanged(); }
+    void on_mYMinLineEdit_textEdited( const QString & ) { mExtentState = UserExtent; extentChanged(); }
+    void on_mYMaxLineEdit_textEdited( const QString & ) { mExtentState = UserExtent; extentChanged(); }
 
     void on_mChangeCrsPushButton_clicked();
 
-    void on_mCrsComboBox_currentIndexChanged( int index ) { crsChanged(); }
+    void on_mCrsComboBox_currentIndexChanged( int ) { crsChanged(); }
 
   private:
     QgsRasterDataProvider* mDataProvider;

src/providers/ogr/qgsogrprovider.cpp

@@ -205,6 +205,9 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
 
   QgsApplication::registerOgrDrivers();
 
+  QSettings settings;
+  CPLSetConfigOption( "SHAPE_ENCODING", settings.value( "/qgis/ignoreShapeEncoding", false ).toBool() ? "" : 0 );
+
   // set the selection rectangle pointer to 0
   mSelectionRectangle = 0;
   // make connection to the data source

src/providers/wms/qgswmsprovider.cpp

@@ -499,7 +499,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle  const &viewExtent, int pixelWidth, i
 
   if ( !retrieveServerCapabilities() )
   {
-    return false;
+    return 0;
   }
 
   // Can we reuse the previously cached image?

src/ui/qgsoptionsbase.ui

@@ -528,6 +528,13 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QCheckBox" name="cbxIgnoreShapeEncoding">
+                <property name="text">
+                 <string>Ignore shapefile encoding</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_5">
                 <item>