API review: deprecation of QVariant::Type causes problems for APIs which return a QVariant

In Qt 5, QVariant::Type is deprecated and replaced with QMetaType::Type

However, QVariant::type() returns QVariant::Type, and this is source incompatible with QMetaType::Type.
For example, http://doc-snapshot.qt-project.org/5.0/qnetworkrequest.html#Attribute-enum has many (obsolete) warnings.
But replacing the QVariant types with QMetaType types causes compilation errors where QVariant::type() is used.
e.g. static QByteArray headerValue(QNetworkRequest::KnownHeaders..) in qnetworkreply.cpp

The compilation error can be avoided by casting to int, but I cannot just change the documentation to talk about a different type than what the API makes available.