Fix crash in QgsEncodingFileDialog

qgis · Oct 5, 2016 · d0ec367 · d0ec367
1 parent 5179a3a
commit d0ec367
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/gui/qgsencodingfiledialog.cpp b/src/gui/qgsencodingfiledialog.cpp
@@ -25,15 +25,17 @@
 #include <QLayout>
 #include <QTextCodec>
 
-QgsEncodingFileDialog::QgsEncodingFileDialog( QWidget * parent,
-    const QString & caption, const QString & directory,
-    const QString & filter, const QString & encoding )
+QgsEncodingFileDialog::QgsEncodingFileDialog( QWidget* parent,
+    const QString& caption, const QString& directory,
+    const QString& filter, const QString& encoding )
     : QFileDialog( parent, caption, directory, filter )
 {
   mCancelAll       = false;
   mCancelAllButton = nullptr;
   mEncodingComboBox = new QComboBox( this );
   QLabel* l = new QLabel( tr( "Encoding:" ), this );
+
+  setOption( QFileDialog::DontUseNativeDialog );
   layout()->addWidget( l );
   layout()->addWidget( mEncodingComboBox );
 

diff --git a/src/gui/qgsencodingfiledialog.h b/src/gui/qgsencodingfiledialog.h
@@ -27,9 +27,9 @@ class GUI_EXPORT QgsEncodingFileDialog: public QFileDialog
 {
     Q_OBJECT
   public:
-    QgsEncodingFileDialog( QWidget * parent = nullptr,
-                           const QString & caption = QString(), const QString & directory = QString(),
-                           const QString & filter = QString(), const QString & encoding = QString() );
+    QgsEncodingFileDialog( QWidget* parent = nullptr,
+                           const QString& caption = QString(), const QString& directory = QString(),
+                           const QString& filter = QString(), const QString& encoding = QString() );
     ~QgsEncodingFileDialog();
     /** Returns a string describing the chosen encoding*/
     QString encoding() const;