diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
| commit | d49d076431d7579ecb33147187fe07eb148112ba (patch) | |
| tree | 668370fb9a2eec50000e371125136921ef4518ab /examples/widgets/tools/codecs/previewform.h | |
| parent | b01e69684b9b36492cc43472edeb72058be9f706 (diff) | |
| parent | 35cdcddd605d8823b7b57129e8d7279133a3ca89 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic1fd51143f903b7e9086fc19ca960dfd9654ee00
Diffstat (limited to 'examples/widgets/tools/codecs/previewform.h')
| -rw-r--r-- | examples/widgets/tools/codecs/previewform.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/tools/codecs/previewform.h b/examples/widgets/tools/codecs/previewform.h index 6335b6539f..02eb3533f3 100644 --- a/examples/widgets/tools/codecs/previewform.h +++ b/examples/widgets/tools/codecs/previewform.h @@ -52,7 +52,7 @@ #define PREVIEWFORM_H #include <QDialog> -#include <QList> +#include <QVector> QT_BEGIN_NAMESPACE class QComboBox; @@ -71,7 +71,7 @@ class PreviewForm : public QDialog public: explicit PreviewForm(QWidget *parent = nullptr); - void setCodecList(const QList<QTextCodec *> &list); + void setCodecList(const QVector<QTextCodec *> &list); void setEncodedData(const QByteArray &data); QString decodedString() const { return decodedStr; } |