[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/plugins/pictureshape
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2010-03-11 15:33:06
Message-ID: 1268321586.675992.32236.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1102008 by zachmann:

o make it possible to compile with qt version < 4.6 again


 M  +8 -0      PictureShape.cpp  


--- trunk/koffice/plugins/pictureshape/PictureShape.cpp #1102007:1102008
@@ -87,7 +87,11 @@
 
     QString key(generate_key(imageData->key(), pixmapSize));
     QPixmap pixmap;
+#if QT_VERSION  >= 0x040600
     if (!QPixmapCache::find(key, &pixmap)) { // first check cache.
+#else
+    if (!QPixmapCache::find(key, pixmap)) { // first check cache.
+#endif
         // no? Does the imageData have it then?
         if (!(imageData->hasCachedPixmap() && imageData->pixmap().size() == pixmapSize)) {
             // ok, not what we want.
@@ -122,7 +126,11 @@
         return;
     }
 
+#if QT_VERSION  >= 0x040600
     if (!QPixmapCache::find(key, &pixmap)) {
+#else
+    if (!QPixmapCache::find(key, pixmap)) {
+#endif
         m_renderQueue->addSize(pixmapSize);
         QTimer::singleShot(0, m_renderQueue, SLOT(renderImage()));
         if (!imageData->hasCachedPixmap()
[prev in list] [next in list] [prev in thread] [next in thread]