QQuickPixmapStore: Don't start expiration timer when application quits

This change removes a warning printed during application closing
stage about a timer started not from QThread.

Change-Id: I93ca4da7066bd5e0784509676bc59969a8e2ad48
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>

diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 818e6fb..3e94d0c 100644 (file)
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -804,8 +804,10 @@ void QQuickPixmapStore::unreferencePixmap(QQuickPixmapData *data)
 
     shrinkCache(-1); // Shrink the cache in case it has become larger than cache_limit
 
-    if (m_timerId == -1 && m_unreferencedPixmaps && !m_destroying)
+    if (m_timerId == -1 && m_unreferencedPixmaps
+            && !m_destroying && !QCoreApplication::closingDown()) {
         m_timerId = startTimer(CACHE_EXPIRE_TIME * 1000);
+    }
 }
 
 void QQuickPixmapStore::referencePixmap(QQuickPixmapData *data)