summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-01-20 04:50:14 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-01-20 04:50:14 (GMT)
commitf418df448f6f57d1fcc91fd6688b5fdb81b996fa (patch)
tree814c1ac260675281ab3941efff3c35a60ed3019a /src/declarative/util
parent2ab0c5a7617edda8e34ea664e527ff897d06a246 (diff)
downloadQt-f418df448f6f57d1fcc91fd6688b5fdb81b996fa.zip
Qt-f418df448f6f57d1fcc91fd6688b5fdb81b996fa.tar.gz
Qt-f418df448f6f57d1fcc91fd6688b5fdb81b996fa.tar.bz2
Remove qHash(QUrl) duplicate
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlpixmapcache.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp
index d024245..4c1d448 100644
--- a/src/declarative/util/qmlpixmapcache.cpp
+++ b/src/declarative/util/qmlpixmapcache.cpp
@@ -60,12 +60,10 @@
QT_BEGIN_NAMESPACE
-#if (QT_VERSION < QT_VERSION_CHECK(4, 6, 2))
-static uint qHash(const QUrl &u)
+inline uint qHash(const QUrl &uri)
{
- return qHash(u.toString());
+ return qHash(uri.toEncoded(QUrl::FormattingOption(0x100)));
}
-#endif
class QmlImageReader : public QThread
{
@@ -222,11 +220,6 @@ static QString toLocalFileOrQrc(const QUrl& url)
return r;
}
-inline uint qHash(const QUrl &uri)
-{
- return qHash(uri.toEncoded(QUrl::FormattingOption(0x100)));
-}
-
typedef QHash<QUrl, QmlPixmapReply *> QmlPixmapReplyHash;
Q_GLOBAL_STATIC(QmlPixmapReplyHash, qmlActivePixmapReplies);