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/mainwindow.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/mainwindow.h')
| -rw-r--r-- | examples/widgets/tools/codecs/mainwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/tools/codecs/mainwindow.h b/examples/widgets/tools/codecs/mainwindow.h index 64494d1960..cf18222520 100644 --- a/examples/widgets/tools/codecs/mainwindow.h +++ b/examples/widgets/tools/codecs/mainwindow.h @@ -51,7 +51,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QList> +#include <QVector> #include <QMainWindow> QT_BEGIN_NAMESPACE @@ -81,10 +81,10 @@ private: void findCodecs(); void createMenus(); - QList<QAction *> saveAsActs; + QVector<QAction *> saveAsActs; QPlainTextEdit *textEdit; PreviewForm *previewForm; - QList<QTextCodec *> codecs; + QVector<QTextCodec *> codecs; EncodingDialog *m_encodingDialog = nullptr; }; |