summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2015-07-05 22:37:40 +0200
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 16:22:27 +0000
commit53abb8267bfa4c261a1aa543f1ad50ed0851bcbf (patch)
treeef7509730372e4d32d7357264252b73728d148fa /src/gui/image
parente2a7d185647f0aaabb3519f1434161faf3de9857 (diff)
QtGui: mark some more types as movable/primitive
These are already held in QVectors. Public API types need to wait until Qt 6, for BC reasons. Even though Q_RELOCATABLE_TYPE deals with most of them, we lack a way to mark a type as primitive, but still isStatic - for QList. Change-Id: I91392b01ae6f94cc847007636e12d4e64c43b2bc Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qicon_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h
index 1df91edeb6..cfae9b3e52 100644
--- a/src/gui/image/qicon_p.h
+++ b/src/gui/image/qicon_p.h
@@ -96,6 +96,7 @@ struct QPixmapIconEngineEntry
QIcon::State state;
bool isNull() const {return (fileName.isEmpty() && pixmap.isNull()); }
};
+Q_DECLARE_TYPEINFO(QPixmapIconEngineEntry, Q_MOVABLE_TYPE);
inline QPixmapIconEngineEntry::QPixmapIconEngineEntry(const QString &file, const QImage &image, QIcon::Mode m, QIcon::State s)
: fileName(file), size(image.size()), mode(m), state(s)