Move the QVariant declaration up in the file.
This is especially necessary for the GHS toolchain which otherwise chokes on the lack of some local definitions made by the Q_DECLARE_SHARED macro. Change-Id: Ie4e355226e4a66e1589e1d422d3a622b11bd9aef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>bb10
parent
96dc9a19ae
commit
79a03c8457
|
|
@ -568,6 +568,7 @@ inline bool operator!=(const QVariant &v1, const QVariantComparisonHelper &v2)
|
|||
return !operator==(v1, v2);
|
||||
}
|
||||
#endif
|
||||
Q_DECLARE_SHARED(QVariant)
|
||||
|
||||
class Q_CORE_EXPORT QSequentialIterable
|
||||
{
|
||||
|
|
@ -846,7 +847,6 @@ inline QT_DEPRECATED bool qVariantCanConvert(const QVariant &variant)
|
|||
#endif
|
||||
|
||||
#endif
|
||||
Q_DECLARE_SHARED(QVariant)
|
||||
|
||||
#ifndef QT_NO_DEBUG_STREAM
|
||||
Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant &);
|
||||
|
|
|
|||
Loading…
Reference in New Issue