diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-06-05 11:05:24 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-06-05 12:03:40 (GMT) |
| commit | 4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e (patch) | |
| tree | 76b183192356a216f9084a938d7f3a87a1f4e262 /src/corelib/global | |
| parent | f101435831bb06f342bb0e2241e3011073341617 (diff) | |
| download | Qt-4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e.zip Qt-4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e.tar.gz Qt-4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e.tar.bz2 | |
handle qreal properties correctly in the meta-object system
When cross-compiling, it's possible that the size of qreal for moc
itself (host platform) is different from the size of qreal on the target
platform. Thus, we should not encode the metatype-id of qreal at moc
time. Instead, use QMetaType::QReal in the generated code so that the
the property flags are only derived at compile time.
We also need to support the pesky QT_COORD_TYPE. In this case, qreal can
be _any_ type (not just float or double), so we encode the property type
as 0 and have a special check in QMetaProperty::type() that resolves the
correct type at runtime.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 3990c7d..a10b6d6 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1004,6 +1004,7 @@ typedef int QNoImplicitBoolCast; #define QT_NO_FPU #endif +// This logic must match the one in qmetatype.h #if defined(QT_COORD_TYPE) typedef QT_COORD_TYPE qreal; #elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) |