diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2020-08-21 22:31:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 22:31:59 +0200 |
| commit | 96d049a195966c86615f67fe9dc690c6c9c0baeb (patch) | |
| tree | c4c507d095d54741807ecbac5b1183b758bb7dc2 | |
| parent | aa51f10a04cc8776f3336b48f94900065cbd8726 (diff) | |
| parent | 21fe6b836e3f2e644103cd97a7a389600958af9b (diff) | |
| download | navit-96d049a195966c86615f67fe9dc690c6c9c0baeb.tar.gz | |
Merge branch 'trunk' into issue_984
| -rw-r--r-- | navit/graphics/qt5/graphics_qt5.cpp | 1 | ||||
| -rw-r--r-- | navit/maptool/maptool.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/navit/graphics/qt5/graphics_qt5.cpp b/navit/graphics/qt5/graphics_qt5.cpp index 11f480c0a..e2747ff78 100644 --- a/navit/graphics/qt5/graphics_qt5.cpp +++ b/navit/graphics/qt5/graphics_qt5.cpp @@ -45,6 +45,7 @@ extern "C" { #include <QFont> #include <QGuiApplication> #include <QPainter> +#include <QPainterPath> #include <QPixmap> #include <QScreen> #include <QSvgRenderer> diff --git a/navit/maptool/maptool.h b/navit/maptool/maptool.h index 37590e30b..49b13fd92 100644 --- a/navit/maptool/maptool.h +++ b/navit/maptool/maptool.h @@ -406,7 +406,7 @@ int write_aux_tiles(struct zip_info *zip_info); int create_tile_hash(void); void write_tilesdir(struct tile_info *info, struct zip_info *zip_info, FILE *out); void merge_tiles(struct tile_info *info); -struct attr map_information_attrs[32]; +extern struct attr map_information_attrs[32]; void index_init(struct zip_info *info, int version); void index_submap_add(struct tile_info *info, struct tile_head *th); |