diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-01-20 04:27:21 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-01-20 04:27:21 (GMT) |
| commit | 2ab0c5a7617edda8e34ea664e527ff897d06a246 (patch) | |
| tree | b62baac08b5cf3d05fedaaa408659cce1cec8f59 /src/declarative/util | |
| parent | 910448c02a05b7fa5670efaadff3e6c12aa06f04 (diff) | |
| parent | 6fa9e7b3364916da5ff72d4a5b2dc9541a6e5d48 (diff) | |
| download | Qt-2ab0c5a7617edda8e34ea664e527ff897d06a246.zip Qt-2ab0c5a7617edda8e34ea664e527ff897d06a246.tar.gz Qt-2ab0c5a7617edda8e34ea664e527ff897d06a246.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qmlpixmapcache.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index b8d342c..d024245 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -60,6 +60,13 @@ QT_BEGIN_NAMESPACE +#if (QT_VERSION < QT_VERSION_CHECK(4, 6, 2)) +static uint qHash(const QUrl &u) +{ + return qHash(u.toString()); +} +#endif + class QmlImageReader : public QThread { Q_OBJECT |