Merge branch 'bugfixes' of github.com:danilocesar/subsurface

Fixed one conflict in qt-ui/diveplanner.cpp - please check I got this
right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 252b1bdb6..4726899e5 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -15,7 +15,7 @@
 #include <QCloseEvent>
 #include <QApplication>
 #include <QFontMetrics>
-#include <QTextBrowser>
+#include <QWebView>
 #include <QTableView>
 #include "divelistview.h"
 #include "starwidget.h"
@@ -413,14 +413,14 @@ void MainWindow::on_actionAboutSubsurface_triggered()
 void MainWindow::on_actionUserManual_triggered()
 {
 	if(!helpView){
-		helpView = new QTextBrowser();
+		helpView = new QWebView();
 	}
 	QString searchPath = getSubsurfaceDataPath("Documentation");
 	if (searchPath != "") {
 		QUrl url(searchPath.append("/user-manual.html"));
-		helpView->setSource(url);
+		helpView->setUrl(url);
 	} else {
-		helpView->setText(tr("Cannot find the Subsurface manual"));
+		helpView->setHtml(tr("Cannot find the Subsurface manual"));
 	}
 	helpView->show();
 }