From 51bf806b41918e6ada76563130726c569201bcf1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 7 Jul 2015 13:01:36 +0200 Subject: [PATCH] qmake: mark some types movable They are already held in QVector. Change-Id: Ib1266956c860ecd4671501ab12ab932a8ce9b7d6 Reviewed-by: Oswald Buddenhagen --- qmake/generators/win32/cesdkhandler.cpp | 1 + qmake/library/qmakeevaluator.h | 1 + 2 files changed, 2 insertions(+) diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp index cbee1d0dbda..a985eccad5d 100644 --- a/qmake/generators/win32/cesdkhandler.cpp +++ b/qmake/generators/win32/cesdkhandler.cpp @@ -49,6 +49,7 @@ struct PropertyContainer QString value; QMap properties; }; +Q_DECLARE_TYPEINFO(PropertyContainer, Q_MOVABLE_TYPE); CeSdkInfo::CeSdkInfo() : m_major(0) , m_minor(0) { diff --git a/qmake/library/qmakeevaluator.h b/qmake/library/qmakeevaluator.h index a60adde84e5..8995d495829 100644 --- a/qmake/library/qmakeevaluator.h +++ b/qmake/library/qmakeevaluator.h @@ -310,6 +310,7 @@ public: QMakeHandler *m_handler; QMakeVfs *m_vfs; }; +Q_DECLARE_TYPEINFO(QMakeEvaluator::Location, Q_PRIMITIVE_TYPE); Q_DECLARE_OPERATORS_FOR_FLAGS(QMakeEvaluator::LoadFlags)