diff options
| author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-03 12:51:32 +0000 |
|---|---|---|
| committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-03 12:51:32 +0000 |
| commit | d80d66ac6fb712bc461786cc345cc78c36cf7e1c (patch) | |
| tree | 6cc821851a8a0470431ca3163d959246ef26e75f | |
| parent | 75d0d0eff939ad2adef7108037e077d3760d20a6 (diff) | |
| download | navit-svn-d80d66ac6fb712bc461786cc345cc78c36cf7e1c.tar.gz | |
Fix:gui/qml:Fixed page reloading on Qt4.6
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit/navit@3118 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | gui/qml/guiProxy.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gui/qml/guiProxy.h b/gui/qml/guiProxy.h index 9e0d482e..2f49764f 100644 --- a/gui/qml/guiProxy.h +++ b/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 |