From 0bb14af9efb6c9dbab8655fa6493d89db66e91c8 Mon Sep 17 00:00:00 2001 From: akashihi Date: Sat, 3 Apr 2010 12:51:32 +0000 Subject: [PATCH] Fix:gui/qml:Fixed page reloading on Qt4.6 git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3118 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/gui/qml/guiProxy.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/navit/navit/gui/qml/guiProxy.h b/navit/navit/gui/qml/guiProxy.h index 9e0d482..2f49764 100644 --- a/navit/navit/gui/qml/guiProxy.h +++ b/navit/navit/gui/qml/guiProxy.h @@ -47,18 +47,20 @@ public slots: dbg(0,"Page is: %s\n",page.toStdString().c_str()); this->source+="/"+page; - //Reload widget - if (this->object->guiWidget) { - this->object->switcherWidget->removeWidget(this->object->guiWidget); - if (this->object->prevGuiWidget) { - delete this->object->prevGuiWidget; - } - this->object->prevGuiWidget=this->object->guiWidget; - } #if QT_VERSION < 0x040700 - this->object->guiWidget = new QmlView(NULL); - this->object->guiWidget->setContentResizable(true); + if (this->object->guiWidget==NULL) { + this->object->guiWidget = new QmlView(NULL); + this->object->guiWidget->setContentResizable(true); + } #else + //Reload widget + if (this->object->guiWidget) { + this->object->switcherWidget->removeWidget(this->object->guiWidget); + if (this->object->prevGuiWidget) { + delete this->object->prevGuiWidget; + } + this->object->prevGuiWidget=this->object->guiWidget; + } this->object->guiWidget = new QDeclarativeView(NULL); this->object->guiWidget->setResizeMode(QDeclarativeView::SizeRootObjectToView); #endif -- 2.7.4