[Marble-devel] [calligra] /: Preserve compatibility with older Marble versions.

[Christoph Feck]

Hi Johannes,

with commit 42a16043 in calligra, you committed the change "Preserve 
compatibility with older Marble versions." (see below)

I tried to compile calligra from master using marble from master, and 
get the error "MapTool.cpp:98:26: error: 'class 
Marble::MarbleControlBox' has no member named 'addMarbleWidget'", 
probably because HAVE_SETMARBLEWIDGET is not set anywhere. 
Could you have a look at the issue? Thanks in advance!

Christoph Feck (kdepepo)
KDE Quality Team

diff --git a/plugins/mapshape/MapTool.cpp 
b/plugins/mapshape/MapTool.cpp
index 9d97cc8..3733271 100644
--- a/plugins/mapshape/MapTool.cpp
+++ b/plugins/mapshape/MapTool.cpp
@@ -92,7 +92,11 @@ void MapTool::activate(ToolActivation 
toolActivation, const QSet<KoShape*> &shap
     }
 
     if (d->m_controlBox) {
+#ifdef HAVE_SETMARBLEWIDGET
         d->m_controlBox->setMarbleWidget(d->m_shape->marbleWidget());
+#else
+        d->m_controlBox->addMarbleWidget(d->m_shape-
>marbleWidget());
+#endif
     }
     useCursor(Qt::ArrowCursor);
 }