diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-03-26 23:35:24 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-03-27 10:41:52 -0700 |
| commit | 605cff32a51bf8b5b7dba73fc18622afded39539 (patch) | |
| tree | 86649ccbd29ffc5fef10a7b8442cad9868d6c41e /qt-ui | |
| parent | 42df3528a07bbd097226151cb50c122210f47bf9 (diff) | |
| download | subsurface-605cff32a51bf8b5b7dba73fc18622afded39539.tar.gz | |
Remove usermanual when building for Android
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 <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | qt-ui/mainwindow.h | 3 | ||||
| -rw-r--r-- | qt-ui/usermanual.h | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index e1b9d3e4f..5b4e9b43d 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -38,6 +38,9 @@ #include "about.h" #include "printdialog.h" #include "divelogimportdialog.h" +#ifndef NO_USERMANUAL +#include "usermanual.h" +#endif MainWindow *MainWindow::m_Instance = NULL; @@ -85,6 +88,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 +560,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 e249398db..51e03c3b8 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -12,7 +12,6 @@ #include <QUrl> #include "ui_mainwindow.h" -#include "usermanual.h" struct DiveList; class QSortFilterProxyModel; @@ -156,7 +155,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 280ca3896..7692a1143 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 |