[Digikam-devel] [digikam] [Bug 339180] cmake and/or compiler pick up libkgeomap header files from previous version

Gilles Caulier caulier.gilles at gmail.com
Mon Nov 3 11:22:42 GMT 2014


https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #22 from Gilles Caulier <caulier.gilles at gmail.com> ---
Git commit 580ef984ee07807da6d58a68d2657ffb89f56537 by Gilles Caulier.
Committed on 02/11/2014 at 22:46.
Pushed by cgilles into branch 'master'.

fix compilation if older libkgeomap is used

M  +3    -0    gpssync/gpssyncdialog.cpp

http://commits.kde.org/kipi-plugins/580ef984ee07807da6d58a68d2657ffb89f56537

diff --git a/gpssync/gpssyncdialog.cpp b/gpssync/gpssyncdialog.cpp
index 33b4257..c8f5d94 100644
--- a/gpssync/gpssyncdialog.cpp
+++ b/gpssync/gpssyncdialog.cpp
@@ -86,6 +86,7 @@
 #include <libkgeomap/kgeomap_widget.h>
 #include <libkgeomap/itemmarkertiler.h>
 #include <libkgeomap/tracks.h>
+#include <libkgeomap/version.h>

 // Local includes

@@ -1222,7 +1223,9 @@ KGeoMapWidget* GPSSyncDialog::makeMapWidget(QWidget**
const pvbox)
     mapWidget->setDragDropHandler(d->mapDragDropHandler);
     mapWidget->addUngroupedModel(d->bookmarkOwner->bookmarkModelHelper());
     mapWidget->addUngroupedModel(d->searchWidget->getModelHelper());
+#if KGEOMAP_VERSION >= 0x030000
     mapWidget->setTrackManager(d->trackManager);
+#endif
     mapWidget->setSortOptionsMenu(d->sortMenu);

     vbox->addWidget(mapWidget);

-- 
You are receiving this mail because:
You are the assignee for the bug.



More information about the Digikam-devel mailing list