diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-17 14:20:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-08-19 09:16:52 +0200 |
| commit | 6d2c5d9ffe255410c34edbb1c1228e68c9d745bd (patch) | |
| tree | 22fab8253e9b04f489e2fd2f82dbf773551168e4 /src/plugins/platforms/xcb | |
| parent | f4f1b53b9646288d73979f8339a90fbbbcb9eedc (diff) | |
Move the printer support backend into it's own plugin
QPlatformIntegration can't have a dependency onto printing
anymore now that printing lives in it's own library. Move
it into a plugin of it's own.
Change-Id: I3ec4b38f4336eb96d92ea799544d17af359c83e1
Reviewed-on: http://codereview.qt.nokia.com/3210
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.h | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index e97b9f2121..a512fb2e19 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -48,8 +48,6 @@ #include "qxcbclipboard.h" #include "qxcbdrag.h" -#include <QtPlatformSupport/private/qgenericunixprintersupport_p.h> - #include <xcb/xcb.h> #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> @@ -79,8 +77,7 @@ #include <QtGui/QScreen> QXcbIntegration::QXcbIntegration(const QStringList ¶meters) - : m_printerSupport(new QGenericUnixPrinterSupport) - , m_eventDispatcher(createUnixEventDispatcher()) + : m_eventDispatcher(createUnixEventDispatcher()) { QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher); @@ -183,11 +180,6 @@ QPlatformNativeInterface * QXcbIntegration::nativeInterface() const return m_nativeInterface; } -QPlatformPrinterSupport *QXcbIntegration::printerSupport() const -{ - return m_printerSupport; -} - QPlatformClipboard *QXcbIntegration::clipboard() const { return m_connections.at(0)->clipboard(); diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index 29835f493f..9d49a90d0a 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -69,7 +69,6 @@ public: QPlatformNativeInterface *nativeInterface()const; - QPlatformPrinterSupport *printerSupport() const; QPlatformClipboard *clipboard() const; QPlatformDrag *drag() const; @@ -80,7 +79,6 @@ private: QPlatformFontDatabase *m_fontDatabase; QPlatformNativeInterface *m_nativeInterface; - QPlatformPrinterSupport *m_printerSupport; QPlatformInputContext *m_inputContext; QAbstractEventDispatcher *m_eventDispatcher; |