diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-11-30 21:58:43 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-11-30 21:58:43 +0000 |
| commit | 5b879f94ebdc1232f73eac650b70270a2916ae2a (patch) | |
| tree | 1cc6265073e6695c7b6d1f4b4955427a13115854 /navit/graphics/qt_qpainter | |
| parent | 589056c1b82569afd55312a15deda13f1c38d7da (diff) | |
| parent | 04f6fbdfe031fc19a22fbf0e5794d3e68f291f9d (diff) | |
| download | navit-5b879f94ebdc1232f73eac650b70270a2916ae2a.tar.gz | |
Merge remote-tracking branch 'origin/trunk' into CI_trusty
Conflicts:
ci/build_linux.sh
Diffstat (limited to 'navit/graphics/qt_qpainter')
| -rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp index 3a7509b0d..65163ea9d 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp @@ -854,7 +854,7 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct return NULL; #endif #ifdef QT_QPAINTER_USE_FREETYPE - font_freetype_new=(struct font_priv *(*)(void *))plugin_get_font_type("freetype"); + font_freetype_new=(struct font_priv *(*)(void *))plugin_get_category_font("freetype"); if (!font_freetype_new) { dbg(lvl_error,"no freetype\n"); return NULL; @@ -921,9 +921,9 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct //############################################################################################################## void plugin_init(void) { - plugin_register_graphics_type("qt_qpainter", graphics_qt_qpainter_new); + plugin_register_category_graphics("qt_qpainter", graphics_qt_qpainter_new); #ifdef QT_QPAINTER_USE_EVENT_QT - plugin_register_event_type("qt", event_qt_new); + plugin_register_category_event("qt", event_qt_new); #endif } |