summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-09-03 15:04:16 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-12 23:37:15 +0200
commit652bd1efca34b7e114836f79c33b5e4a248faaee (patch)
tree23eea549c4a282626ec5d891011e76482b8cc4be /src/gui/image
parentead02871cc97fa7dae956b1cd649a91de432dc73 (diff)
Make QStringList an alias to QList<QString>
Fix our API, so that QStringList and QList<QString> are the same thing. This required a bit of refactoring in QList and moving the indexOf(), lastIndexOf() and contains() method into QListSpecialMethods. In addition, we need to ensure that the QStringList(const QString&) constructor is still available for compatibility with Qt 5. Once those two are done, all methods in QStringList can be moved into QListSpecialMethods<QString>. Change-Id: Ib8afbf5b6d9df4d0d47051252233506f62335fa3 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qimage.h1
-rw-r--r--src/gui/image/qimagereader.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 0866984dec..2ce9d96e6a 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE
class QColorSpace;
class QColorTransform;
class QIODevice;
-class QStringList;
class QTransform;
class QVariant;
diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h
index 4d418bd7d0..23c8a916d2 100644
--- a/src/gui/image/qimagereader.h
+++ b/src/gui/image/qimagereader.h
@@ -53,7 +53,6 @@ class QColor;
class QIODevice;
class QRect;
class QSize;
-class QStringList;
class QImageReaderPrivate;
class Q_GUI_EXPORT QImageReader