summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.h
diff options
context:
space:
mode:
authorMichael Bruning <michael.bruning@theqtcompany.com>2016-01-04 10:21:45 +0100
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2016-02-10 09:40:22 +0000
commitaaa64baed2790904ca5c54f35a5070409a913732 (patch)
treee129b75dbfcc48f02ea9d5a9d46de3620b2e38be /src/core/web_engine_context.h
parentd1f4409a2b1e0143be0d4fd734f3dd83255ea35c (diff)
Include printing sources and enable printing for desktop platforms.
Also adds Qt specific core classes for printing as well as adding printing related objects to the web engine context and including the printing sources in the builds for the desktop platforms. Also updates src/3rdparty submodule SHA-1. Change-Id: I9c2631c59f63571c0840d838077e66122bacc741 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_context.h')
-rw-r--r--src/core/web_engine_context.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index 6d40d72a2..3c69d87ca 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -58,6 +58,12 @@ class BrowserMainRunner;
class ContentMainRunner;
}
+#if defined(ENABLE_BASIC_PRINTING)
+namespace printing {
+class PrintJobManager;
+}
+#endif // defined(ENABLE_BASIC_PRINTING)
+
QT_FORWARD_DECLARE_CLASS(QObject)
namespace QtWebEngineCore {
@@ -72,7 +78,9 @@ public:
QtWebEngineCore::BrowserContextAdapter *defaultBrowserContext();
QObject *globalQObject();
-
+#if defined(ENABLE_BASIC_PRINTING)
+ printing::PrintJobManager* getPrintJobManager();
+#endif // defined(ENABLE_BASIC_PRINTING)
void destroyBrowserContext();
void destroy();
@@ -88,6 +96,9 @@ private:
QObject* m_globalQObject;
QExplicitlySharedDataPointer<BrowserContextAdapter> m_defaultBrowserContext;
scoped_ptr<devtools_http_handler::DevToolsHttpHandler> m_devtools;
+#if defined(ENABLE_BASIC_PRINTING)
+ scoped_ptr<printing::PrintJobManager> m_printJobManager;
+#endif // defined(ENABLE_BASIC_PRINTING)
};
} // namespace