diff options
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlcompositetypemanager.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/util/qmlpixmapcache.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index 9437961..9c78912 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -55,11 +55,12 @@ QT_BEGIN_NAMESPACE +#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0)) inline uint qHash(const QUrl &uri) { return qHash(uri.toEncoded(QUrl::FormattingOption(0x100))); } - +#endif QmlCompositeTypeData::QmlCompositeTypeData() : status(Invalid), errorType(NoError), component(0), compiledComponent(0) diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index 755863a..f1c4a12 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -70,11 +70,12 @@ static const int maxImageRequestCount = 8; QT_BEGIN_NAMESPACE +#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0)) inline uint qHash(const QUrl &uri) { return qHash(uri.toEncoded(QUrl::FormattingOption(0x100))); } - +#endif class QmlImageReaderEvent : public QEvent { |