Fix breakage due to meta-type id reordering in qtbase
authorKent Hansen <kent.hansen@nokia.com>
Thu, 26 Jan 2012 14:04:51 +0000 (15:04 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 26 Jan 2012 14:35:12 +0000 (15:35 +0100)
commit40c8da550cac90460970f1dbdca1e6f02be99a8c
tree3009847e74c769d7f79fba854b598aa5ea49a914
parentccc18c27b18a07e0e3b971fe81919ca57e63c5d2
Fix breakage due to meta-type id reordering in qtbase

Commit aee1f6cc413f56bf4962324799ee3887c3dd037f in qtbase changed the
order/IDs of the "extended" meta-types, so that they are not
bigger than QVariant::UserType (127) anymore. This caused autotests
in qtdeclarative to assert/fail.

Ths commit adapts the logic in qtdeclarative accordingly, in
particular so that QVariant/QObjectStar aren't treated as value
types.

Change-Id: I3e6c0b2c9fb04bfd7f7fd94da2741f9536229b87
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
src/declarative/qml/qdeclarativevaluetype.cpp
tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp