diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-12-13 16:12:32 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-19 10:21:16 +0100 |
| commit | 31d8ecfe3b6b5ab27e4bb36aeeeae917e0aabc23 (patch) | |
| tree | 171fc47b8cfe04dfd2c734e24679c99f7f97db7f /src/gui | |
| parent | e75e4421cdcaba1e0c2920251b114d0318155d3c (diff) | |
Make QMetaTypeInterface POD.
QMetaTypeInterface has to be POD because it is constructed in a static
array. Constructors in POD types are not allowed so we will use a macro
instead.
Change-Id: Iab9ae776dfe4dcd7148558f02d6181c5917aa5c3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 3b60f29e83..a7f2f83aab 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -477,7 +477,7 @@ const QVariant::Handler qt_gui_variant_handler = { extern Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper; #define QT_IMPL_METATYPEINTERFACE_GUI_TYPES(MetaTypeName, MetaTypeId, RealName) \ - QMetaTypeInterface(static_cast<RealName*>(0)), + QT_METATYPE_INTERFACE_INIT(RealName), static const QMetaTypeInterface qVariantGuiHelper[] = { QT_FOR_EACH_STATIC_GUI_CLASS(QT_IMPL_METATYPEINTERFACE_GUI_TYPES) |