diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-27 09:58:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-20 20:01:33 +0200 |
| commit | 03326a2fec416405b437089874f6439e937bbada (patch) | |
| tree | 48d7137c3cd5e6f537e06e97380d3c1e76a56af9 /src/gui/image/qimage.h | |
| parent | 1a9a4af388477efd9f7008d5c0bb74432c20279d (diff) | |
Move implementation of QVector/List back to qlist.h
And name the main class QList. That's also the one we document.
This gives less porting pain for our users, and a lot less churn
in our API, as we use QList in Qt 5 in 95% of our API.
In addition, it gives more consistent naming with QStringList and
QByteArrayList and disambiguates QList vs QVector(2|3|4)D.
Fixes: QTBUG-84468
Change-Id: I3cba9d1d3179969d8bf9320b31be2230d021d1a9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 27849a2589..f5d034e1e7 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -49,6 +49,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qrect.h> #include <QtCore/qstring.h> +#include <QtCore/qcontainerfwd.h> #if defined(Q_OS_DARWIN) || defined(Q_QDOC) Q_FORWARD_DECLARE_MUTABLE_CG_TYPE(CGImage); @@ -63,7 +64,6 @@ class QIODevice; class QStringList; class QTransform; class QVariant; -template <class T> class QVector; struct QImageData; |