From 0b1ca258f78a3aaeb4153348fb05176e3d05f960 Mon Sep 17 00:00:00 2001 From: martin-s Date: Thu, 15 Sep 2011 15:48:50 +0000 Subject: [PATCH] Add:graphics_qt_qpainter:Enable -qws switch optionally git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4783 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp | 9 +++++++-- navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp index 61cb8a9..b6201b5 100644 --- a/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +++ b/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp @@ -614,7 +614,7 @@ static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int alpha, int wraparound); static int argc=1; -static char *argv[]={(char *)"navit",NULL}; +static char *argv[]={(char *)"navit",NULL,NULL}; static int fullscreen(struct window *win, int on) @@ -958,7 +958,12 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct else QApplication::setGraphicsSystem("raster"); #endif - + if ((attr=attr_search(attrs, NULL, attr_flags))) + ret->flags=attr->u.num; + if (ret->flags & 1) { + argv[1]="-qws"; + argc++; + } #ifndef QT_QPAINTER_NO_APP #ifdef HAVE_QPE ret->app = new QPEApplication(argc, argv); diff --git a/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.h b/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.h index e570842..7b784bd 100644 --- a/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.h +++ b/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.h @@ -140,7 +140,7 @@ struct graphics_priv { struct font_priv * (*font_freetype_new)(void *meth); struct font_freetype_methods freetype_methods; #endif - int w,h; + int w,h,flags; struct navit* nav; }; -- 2.7.4