diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2017-06-20 15:36:43 +0200 |
|---|---|---|
| committer | Rolf Eike Beer <eb@emlix.com> | 2017-06-26 12:37:21 +0000 |
| commit | 085c2c529473bbe9dd7c8c5698a45053520cc423 (patch) | |
| tree | 2830cfdb0750d303c41f411dd6a8ea3eed0fd6e9 /examples/webenginewidgets/demobrowser/browsermainwindow.h | |
| parent | f8d91f930057154633d91cd513ce313d4c400090 (diff) | |
Always compile QWebEnginePage::print
- Remove two out of five layers of ifdefs around and inside this method.
- Now always compiled but will yield an error if printing is disabled.
- Remove printing-related ifdefs from demobrowser.
Task-number: QTBUG-61510
Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Diffstat (limited to 'examples/webenginewidgets/demobrowser/browsermainwindow.h')
| -rw-r--r-- | examples/webenginewidgets/demobrowser/browsermainwindow.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h index 91e1c1d2f..5bbbb2924 100644 --- a/examples/webenginewidgets/demobrowser/browsermainwindow.h +++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h @@ -56,9 +56,7 @@ #include <QtCore/QUrl> QT_BEGIN_NAMESPACE -#ifndef QT_NO_PRINTER class QPrinter; -#endif class QWebEnginePage; QT_END_NAMESPACE @@ -142,10 +140,8 @@ private slots: void slotSwapFocus(); void slotHandlePdfPrinted(const QByteArray&); -#ifndef QT_NO_PRINTER void slotHandlePagePrinted(bool result); void printRequested(QWebEnginePage *page); -#endif void geometryChangeRequested(const QRect &geometry); void updateToolbarActionText(bool visible); void updateBookmarksToolbarActionText(bool visible); @@ -180,9 +176,7 @@ private: QAction *m_restoreLastSession; QAction *m_addBookmark; -#ifndef QT_NO_PRINTER QPrinter *m_currentPrinter; -#endif QIcon m_reloadIcon; QIcon m_stopIcon; |