mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove printing when building for Android

Browse source 
Qt for Android doesn't support printing.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-03-26 23:36:06 +01:00 • committed by Dirk Hohndel
parent 605cff32a5
commit 198199adae
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/mainwindow.cpp
View file

@ -36,7 +36,9 @@
#include "simplewidgets.h" #include "simplewidgets.h"
#include "diveplanner.h" #include "diveplanner.h"
#include "about.h" #include "about.h"
#ifndef NO_PRINTING
#include "printdialog.h" #include "printdialog.h"
#endif
#include "divelogimportdialog.h" #include "divelogimportdialog.h"
#ifndef NO_USERMANUAL #ifndef NO_USERMANUAL
#include "usermanual.h" #include "usermanual.h"
@ -91,6 +93,9 @@ MainWindow::MainWindow() : QMainWindow(),
#ifdef NO_USERMANUAL #ifdef NO_USERMANUAL
ui.menuHelp->removeAction(ui.actionUserManual); ui.menuHelp->removeAction(ui.actionUserManual);
#endif #endif
#ifdef NO_PRINTING
ui.menuFile->removeAction(ui.actionPrint);
#endif
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -274,9 +279,11 @@ void MainWindow::on_actionExportUDDF_triggered()
void MainWindow::on_actionPrint_triggered() void MainWindow::on_actionPrint_triggered()
{ {
#ifndef NO_PRINTING
PrintDialog dlg(this); PrintDialog dlg(this);
dlg.exec(); dlg.exec();
#endif
} }
void MainWindow::disableDcShortcuts() void MainWindow::disableDcShortcuts()

1
qt-ui/printdialog.h
View file

@ -29,5 +29,4 @@ slots:
void printClicked(); void printClicked();
void onPaintRequested(QPrinter *); void onPaintRequested(QPrinter *);
}; };
#endif // PRINTDIALOG_H #endif // PRINTDIALOG_H

2
subsurface-configure.pri
View file

@ -139,7 +139,7 @@ isEmpty(LIBGIT2DEVEL) {
link_pkgconfig: packagesExist(libiconv): PKGCONFIG += libiconv link_pkgconfig: packagesExist(libiconv): PKGCONFIG += libiconv
# disable things when were on android # disable things when were on android
contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTING
# #
# Find libmarble # Find libmarble

16
subsurface.pro
View file

@ -76,7 +76,11 @@ HEADERS = \
qt-ui/profile/divetooltipitem.h \ qt-ui/profile/divetooltipitem.h \
qt-ui/profile/ruleritem.h qt-ui/profile/ruleritem.h
android: HEADERS -= qt-ui/usermanual.h android: HEADERS -= \
qt-ui/usermanual.h \
qt-ui/printdialog.h \
qt-ui/printlayout.h \
qt-ui/printoptions.h
SOURCES = \ SOURCES = \
deco.c \ deco.c \
@ -148,7 +152,11 @@ else: linux*: SOURCES += linux.c
mac: SOURCES += macos.c mac: SOURCES += macos.c
win32: SOURCES += windows.c win32: SOURCES += windows.c
android: SOURCES -= qt-ui/usermanual.cpp android: SOURCES -= \
qt-ui/usermanual.cpp \
qt-ui/printdialog.cpp \
qt-ui/printlayout.cpp \
qt-ui/printoptions.cpp
FORMS = \ FORMS = \
qt-ui/about.ui \ qt-ui/about.ui \
@ -167,8 +175,8 @@ FORMS = \
qt-ui/divelogimportdialog.ui \ qt-ui/divelogimportdialog.ui \
qt-ui/usermanual.ui qt-ui/usermanual.ui
# Usermanual isn't supported on android right now # Nether usermanual or printing is supported on android right now
android: FORMS -= qt-ui/usermanual.ui android: FORMS -= qt-ui/usermanual.ui qt-ui/printoptions.ui
RESOURCES = subsurface.qrc RESOURCES = subsurface.qrc