Our usermanual is based on webkit, and thats not supported in Qt for Android. We should probably replace it with a Android native webview somehow.
Signed-off-by: Anton Lundin <gla...@acc.umu.se> --- qt-ui/mainwindow.cpp | 5 +++++ qt-ui/mainwindow.h | 2 +- qt-ui/usermanual.h | 1 - subsurface-configure.pri | 2 +- subsurface.pro | 7 +++++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index e1b9d3e..aa93a5c 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -85,6 +85,9 @@ MainWindow::MainWindow() : QMainWindow(), ui.layoutWidget->hide(); ui.menuView->removeAction(ui.actionViewGlobe); #endif +#ifdef NO_USERMANUAL + ui.menuHelp->removeAction(ui.actionUserManual); +#endif } MainWindow::~MainWindow() @@ -554,10 +557,12 @@ void MainWindow::on_actionAboutSubsurface_triggered() void MainWindow::on_actionUserManual_triggered() { +#ifndef NO_USERMANUAL if (!helpView) { helpView = new UserManual(); } helpView->show(); +#endif } QString MainWindow::filter() diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index e249398..25ce8fe 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -156,7 +156,7 @@ private: Ui::MainWindow ui; QAction *actionNextDive; QAction *actionPreviousDive; - UserManual *helpView; + QMainWindow *helpView; QTreeView *yearlyStats; QAbstractItemModel *yearlyStatsModel; CurrentState state; diff --git a/qt-ui/usermanual.h b/qt-ui/usermanual.h index 280ca38..7692a11 100644 --- a/qt-ui/usermanual.h +++ b/qt-ui/usermanual.h @@ -29,5 +29,4 @@ private: Ui::UserManual *ui; void search(QString, QWebPage::FindFlags); }; - #endif // USERMANUAL_H diff --git a/subsurface-configure.pri b/subsurface-configure.pri index 28c567f..14e5cef 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -139,7 +139,7 @@ isEmpty(LIBGIT2DEVEL) { link_pkgconfig: packagesExist(libiconv): PKGCONFIG += libiconv # disable things when were on android -contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE +contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL # # Find libmarble diff --git a/subsurface.pro b/subsurface.pro index df5f796..baf1341 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -76,6 +76,8 @@ HEADERS = \ qt-ui/profile/divetooltipitem.h \ qt-ui/profile/ruleritem.h +android: HEADERS -= qt-ui/usermanual.h + SOURCES = \ deco.c \ device.c \ @@ -146,6 +148,8 @@ else: linux*: SOURCES += linux.c mac: SOURCES += macos.c win32: SOURCES += windows.c +android: SOURCES -= qt-ui/usermanual.cpp + FORMS = \ qt-ui/about.ui \ qt-ui/divecomputermanagementdialog.ui \ @@ -163,6 +167,9 @@ FORMS = \ qt-ui/divelogimportdialog.ui \ qt-ui/usermanual.ui +# Usermanual isn't supported on android right now +android: FORMS -= qt-ui/usermanual.ui + RESOURCES = subsurface.qrc TRANSLATIONS = \ -- 1.8.3.2 _______________________________________________ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface