[Merkaartor] Qt compatibility
Moritz Barsnick
barsnick at gmx.net
Wed Dec 15 15:28:44 GMT 2010
Hi,
thanks for fixing builds with older Qt versions.
I have found another glitch for Qt < 4.5, an accidental omission
obviously, as member pm on longer exists. I am attaching a patch (with
some guesswork: curPix vs. newPix).
Note, I build with
NODEBUG=1 GEOIMAGE=0 GPSD=1 GDAL=0 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1 USE_BUILTIN_BOOST=1
so I am potentially missing other stuff.
I might soon stop riding this old horse. :-)
Moritz
-------------- next part --------------
diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
index f1ed013..98ceb69 100644
--- a/src/Layers/ImageMapLayer.cpp
+++ b/src/Layers/ImageMapLayer.cpp
@@ -524,9 +524,9 @@ void ImageMapLayer::pan(QPoint delta)
#if QT_VERSION < 0x040600
QPixmap savPix;
- savPix = p->pm.copy();
- p->pm.fill(Qt::transparent);
- QPainter P(&p->pm);
+ savPix = p->curPix.copy();
+ p->curPix.fill(Qt::transparent);
+ QPainter P(&p->curPix);
P.drawPixmap(delta, savPix);
#else
QRegion exposed;
More information about the Merkaartor
mailing list