Skip to content

Commit d0ec367

Browse files
committed
Fix crash in QgsEncodingFileDialog
1 parent 5179a3a commit d0ec367

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/gui/qgsencodingfiledialog.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@
2525
#include <QLayout>
2626
#include <QTextCodec>
2727

28-
QgsEncodingFileDialog::QgsEncodingFileDialog( QWidget * parent,
29-
const QString & caption, const QString & directory,
30-
const QString & filter, const QString & encoding )
28+
QgsEncodingFileDialog::QgsEncodingFileDialog( QWidget* parent,
29+
const QString& caption, const QString& directory,
30+
const QString& filter, const QString& encoding )
3131
: QFileDialog( parent, caption, directory, filter )
3232
{
3333
mCancelAll = false;
3434
mCancelAllButton = nullptr;
3535
mEncodingComboBox = new QComboBox( this );
3636
QLabel* l = new QLabel( tr( "Encoding:" ), this );
37+
38+
setOption( QFileDialog::DontUseNativeDialog );
3739
layout()->addWidget( l );
3840
layout()->addWidget( mEncodingComboBox );
3941

src/gui/qgsencodingfiledialog.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class GUI_EXPORT QgsEncodingFileDialog: public QFileDialog
2727
{
2828
Q_OBJECT
2929
public:
30-
QgsEncodingFileDialog( QWidget * parent = nullptr,
31-
const QString & caption = QString(), const QString & directory = QString(),
32-
const QString & filter = QString(), const QString & encoding = QString() );
30+
QgsEncodingFileDialog( QWidget* parent = nullptr,
31+
const QString& caption = QString(), const QString& directory = QString(),
32+
const QString& filter = QString(), const QString& encoding = QString() );
3333
~QgsEncodingFileDialog();
3434
/** Returns a string describing the chosen encoding*/
3535
QString encoding() const;

0 commit comments

Comments
 (0)