diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-16 01:32:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-16 01:32:35 (GMT) |
| commit | 6f3649260d157584361112a94733b92f10c01b84 (patch) | |
| tree | 13197132bd1f3854572728ff1699fa6780021365 /src/declarative/util/qmlpixmapcache.cpp | |
| parent | b77e592cf9709c31f61c3e1d229b2a6c446ab8bc (diff) | |
| parent | e7041de4d51a3166948924fc8640c8c6bc8daa7b (diff) | |
| download | Qt-6f3649260d157584361112a94733b92f10c01b84.zip Qt-6f3649260d157584361112a94733b92f10c01b84.tar.gz Qt-6f3649260d157584361112a94733b92f10c01b84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/util/qmlpixmapcache.cpp')
| -rw-r--r-- | src/declarative/util/qmlpixmapcache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index 623aaf0..4e581bd 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -608,6 +608,6 @@ int QmlPixmapCache::pendingRequests() return qmlActivePixmapReplies()->count(); } -#include <qmlpixmapcache.moc> - QT_END_NAMESPACE + +#include <qmlpixmapcache.moc> |