diff options
author | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
---|---|---|
committer | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
commit | 5030d911084584f9b37aeaa916ab43130044edbf (patch) | |
tree | 0f0e400aa2c575c3fcdfcceaa6012d2f760e525e /navit/graphics/qt_qpainter | |
parent | 449e5530c4ee68f77691c811f0670cf90e9e58a4 (diff) | |
parent | 59bbe485ba74a6df5ec944275ae28fc1bd98981e (diff) | |
download | navit-5030d911084584f9b37aeaa916ab43130044edbf.tar.gz |
Merge branch 'trunk' into trac/1341trac/1341
Conflicts:
navit/Makefile.am
navit/xpm/Makefile.am
po/Makefile.am
Diffstat (limited to 'navit/graphics/qt_qpainter')
-rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp index 714f0753e..65163ea9d 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp @@ -696,7 +696,8 @@ static struct graphics_methods graphics_methods = { overlay_disable, NULL, set_attr, - + NULL, /* show_native_keyboard */ + NULL, /* hide_native_keyboard */ }; //############################################################################################################## @@ -853,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; @@ -920,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 } |