diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-23 17:11:05 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-27 09:13:09 +0000 |
| commit | bce063054682e590e9fa8aa9d2ec19ca26ea3d49 (patch) | |
| tree | 72eafcf4e0d2c6518ffd38772f7f5758bf6a4137 /src/core/web_engine_context.h | |
| parent | 817c117cf89f15e1877107597c8daeff956fd1a6 (diff) | |
Adaptations for Chromium 56
Change-Id: I78240d7956de4716757761fc6517f031b4adb822
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_engine_context.h')
| -rw-r--r-- | src/core/web_engine_context.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index 0058ccd84..386f43035 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -42,8 +42,11 @@ #include "qtwebenginecoreglobal.h" +#include "build/build_config.h" + #include "base/memory/ref_counted.h" #include "base/values.h" +#include "printing/features/features.h" #include <QSharedPointer> @@ -56,11 +59,11 @@ class BrowserMainRunner; class ContentMainRunner; } -#if defined(ENABLE_BASIC_PRINTING) +#if BUILDFLAG(ENABLE_BASIC_PRINTING) namespace printing { class PrintJobManager; } -#endif // defined(ENABLE_BASIC_PRINTING) +#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) QT_FORWARD_DECLARE_CLASS(QObject) @@ -77,9 +80,9 @@ public: QSharedPointer<QtWebEngineCore::BrowserContextAdapter> defaultBrowserContext(); QObject *globalQObject(); -#if defined(ENABLE_BASIC_PRINTING) +#if BUILDFLAG(ENABLE_BASIC_PRINTING) printing::PrintJobManager* getPrintJobManager(); -#endif // defined(ENABLE_BASIC_PRINTING) +#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) void destroyBrowserContext(); void destroy(); @@ -95,9 +98,9 @@ private: QObject* m_globalQObject; QSharedPointer<QtWebEngineCore::BrowserContextAdapter> m_defaultBrowserContext; std::unique_ptr<DevToolsServerQt> m_devtoolsServer; -#if defined(ENABLE_BASIC_PRINTING) +#if BUILDFLAG(ENABLE_BASIC_PRINTING) std::unique_ptr<printing::PrintJobManager> m_printJobManager; -#endif // defined(ENABLE_BASIC_PRINTING) +#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) }; } // namespace |