diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2015-07-01 17:08:35 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-01 09:00:13 -0700 |
| commit | c3f6fcb0bfd4e66f77dbc9daee442fbd5dc7e003 (patch) | |
| tree | 3f30911b58790d8d4ff83198693fffaa835e04e9 | |
| parent | eda0190e2ad0b4e7a813d559f022d9f0b8f41831 (diff) | |
| download | subsurface-c3f6fcb0bfd4e66f77dbc9daee442fbd5dc7e003.tar.gz | |
Fix NO_PRINTING when printing is disabled in Qt
Qt for android doesn't have any printing support, so this fixes
NO_PRINTING so we can build against a Qt without any printing support at
all.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | qt-ui/printdialog.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/printdialog.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fe2d8702..f92afeae5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,6 +120,8 @@ else() printer.cpp templatelayout.cpp ) + set(PRINTING_PKG PrintSupport) + set(PRINTING_LIB Qt5::PrintSupport) endif() if(NO_USERMANUAL) @@ -153,8 +155,8 @@ if(SUBSURFACE_MOBILE) set(QT_QUICK_PKG Quick) set(QT_QUICK_LIB Qt5::Quick) endif() -find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} PrintSupport Svg Test LinguistTools ${QT_QUICK_PKG}) -set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} Qt5::PrintSupport Qt5::Svg ${QT_QUICK_LIB}) +find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} ${PRINTING_PKG} Svg Test LinguistTools ${QT_QUICK_PKG}) +set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} ${PRINTING_LIB} Qt5::Svg ${QT_QUICK_PKG}) set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test) # Generate the ssrf-config.h every 'make' diff --git a/qt-ui/printdialog.cpp b/qt-ui/printdialog.cpp index 4a3314691..6f30f89f5 100644 --- a/qt-ui/printdialog.cpp +++ b/qt-ui/printdialog.cpp @@ -2,6 +2,7 @@ #include "printoptions.h" #include "mainwindow.h" +#ifndef NO_PRINTING #include <QProgressBar> #include <QPrintPreviewDialog> #include <QPrintDialog> @@ -10,7 +11,6 @@ #define SETTINGS_GROUP "PrintDialog" -#ifndef NO_PRINTING PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) { // check if the options were previously stored in the settings; if not use some defaults. diff --git a/qt-ui/printdialog.h b/qt-ui/printdialog.h index 9937cd549..a34037442 100644 --- a/qt-ui/printdialog.h +++ b/qt-ui/printdialog.h @@ -1,12 +1,12 @@ #ifndef PRINTDIALOG_H #define PRINTDIALOG_H +#ifndef NO_PRINTING #include <QDialog> #include <QPrinter> #include "printoptions.h" #include "printer.h" -#ifndef NO_PRINTING class QProgressBar; class PrintOptions; class PrintLayout; |