QNetworkCacheMetaData metaData = cache->metaData(url);
++<<<<<<< HEAD:src/map/mapfetcher.cpp
+ if (metaData.expirationDate().isValid()) {
++=======
+ if ((metaData.expirationDate().isValid()) && (url.isValid())) {
++>>>>>>> master:src/map/mapfetcher.cpp
if (metaData.expirationDate() < QDateTime::currentDateTime()) {
cache->remove(url);
}
}
++<<<<<<< HEAD:src/map/mapfetcher.cpp
+ QIODevice *cacheImage = m_manager->cache()->data(url);
++=======
+ QIODevice *cacheImage = cache->data(url);
++>>>>>>> master:src/map/mapfetcher.cpp
if (cacheImage) {
QImage image;