diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-04 04:49:20 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-04 04:49:20 (GMT) |
commit | eda079761194a96783cdb8d49c79eb2c9c0b7dac (patch) | |
tree | 4ca35b23b09e6c3d1d2fb11ec943c9347bb5719b /src/declarative/qml/qdeclarativeenginedebug.cpp | |
parent | 4164a11032b64fe5a557515f283fa0e4c6d0260d (diff) | |
download | Qt-eda079761194a96783cdb8d49c79eb2c9c0b7dac.zip Qt-eda079761194a96783cdb8d49c79eb2c9c0b7dac.tar.gz Qt-eda079761194a96783cdb8d49c79eb2c9c0b7dac.tar.bz2 |
Compile without QVariant::EasingCurve in Qt 4.6.2.
Diffstat (limited to 'src/declarative/qml/qdeclarativeenginedebug.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeenginedebug.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp index 09882cb..3e4acbe 100644 --- a/src/declarative/qml/qdeclarativeenginedebug.cpp +++ b/src/declarative/qml/qdeclarativeenginedebug.cpp @@ -117,7 +117,7 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx) QVariant value = prop.read(obj); rv.value = valueContents(value); - if (QVariant::Type(prop.userType()) < QVariant::UserType) { + if (QDeclarativeValueTypeFactory::isValueType(prop.userType())) { rv.type = QDeclarativeObjectProperty::Basic; } else if (QDeclarativeMetaType::isQObject(prop.userType())) { rv.type = QDeclarativeObjectProperty::Object; @@ -131,7 +131,7 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx) QVariant QDeclarativeEngineDebugServer::valueContents(const QVariant &value) const { int userType = value.userType(); - if (QVariant::Type(userType) < QVariant::UserType) + if (QDeclarativeValueTypeFactory::isValueType(userType)) return value; /* |