Move printing into it's own library

Create a libQtPrintSupport library that contains our current
printing infrastructure. Long term this will get replaced
with a libQtPrint, as the current architecture is not
really maintainable.

Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2
Reviewed-on: http://codereview.qt.nokia.com/3209
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

104 files changed, 302 insertions, 92 deletions

diff --git a/bin/fixqt4headers b/bin/fixqt4headers
index 0e3d541d03..58b0fdf43d 100755
--- a/bin/fixqt4headers
+++ b/bin/fixqt4headers
@@ -8,7 +8,7 @@ echo $files
 
 for module in $modules; do
 # once we change other things, change the line from == "QtWidgets" to != "Qt" to get everything fixed
-    if [ $module == "QtWidgets" ]; then
+    if [ $module == "QtWidgets" ] || [ $module == "QtPrintSupport" ]; then
         echo $module ":"
         includes=`ls $QTDIR/include/$module`
         for i in $includes; do
diff --git a/examples/itemviews/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro
index 6a3d8b5983..aaa90e7998 100644
--- a/examples/itemviews/spreadsheet/spreadsheet.pro
+++ b/examples/itemviews/spreadsheet/spreadsheet.pro
@@ -7,7 +7,7 @@ TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 
-QT += widgets
+QT += widgets printsupport
 CONFIG += qt warn_on
 #unix:contains(QT_CONFIG, dbus):QT += dbus widgets
 
diff --git a/examples/richtext/textedit/textedit.pro b/examples/richtext/textedit/textedit.pro
index e5732ebfd3..b364a00f98 100644
--- a/examples/richtext/textedit/textedit.pro
+++ b/examples/richtext/textedit/textedit.pro
@@ -19,5 +19,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
 INSTALLS += target sources
 
-QT += widgets
+QT += widgets printsupport
 symbian: CONFIG += qt_example
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 7466b13d03..f1d5bbaea5 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -21,7 +21,6 @@ include(text/text.pri)
 include(painting/painting.pri)
 include(util/util.pri)
 include(math3d/math3d.pri)
-include(printsupport/printsupport.pri)
 
 include(egl/egl.pri)
 
diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index 886ca16da3..5564049c0d 100644
--- a/src/gui/kernel/qplatformintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
@@ -43,7 +43,6 @@
 
 #include <QtGui/QPlatformFontDatabase>
 #include <QtGui/QPlatformClipboard>
-#include <QtGui/QPlatformPrinterSupport>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <private/qdnd_p.h>
@@ -209,12 +208,7 @@ QPlatformGLContext *QPlatformIntegration::createPlatformGLContext(QGuiGLContext
 
 QPlatformPrinterSupport *QPlatformIntegration::printerSupport() const
 {
-    static QPlatformPrinterSupport *ps = 0;
-#ifndef QT_NO_PRINTER
-    if (!ps)
-        ps = new QPlatformPrinterSupport;
-#endif
-    return ps;
+    return 0;
 }
 
 /*!
diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index 5aeb01effe..6df5052c06 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -164,7 +164,7 @@ private:
 class QPdfWriter;
 class QPdfEnginePrivate;
 
-class QPdfEngine : public QPaintEngine
+class Q_GUI_EXPORT QPdfEngine : public QPaintEngine
 {
     Q_DECLARE_PRIVATE(QPdfEngine)
     friend class QPdfWriter;
@@ -210,7 +210,7 @@ private:
     void updateClipPath(const QPainterPath & path, Qt::ClipOperation op);
 };
 
-class QPdfEnginePrivate : public QPaintEnginePrivate
+class Q_GUI_EXPORT QPdfEnginePrivate : public QPaintEnginePrivate
 {
     Q_DECLARE_PUBLIC(QPdfEngine)
 public:
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 0a4b61f414..03845deb38 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -57,7 +57,6 @@
 #include "qtextdocument.h"
 #include "private/qtextdocument_p.h"
 #include "qtextlist.h"
-#include "qprinter.h"
 #include "qtextdocumentwriter.h"
 #include "private/qtextcursor_p.h"
 #include "qpagedpaintdevice.h"
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index c3dd72ad41..6e3d5286e0 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -55,7 +55,6 @@
 
 #include "qtexthtmlparser_p.h"
 #include "qpainter.h"
-#include "qprinter.h"
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qdir.h>
@@ -63,7 +62,6 @@
 #include "private/qdataurl_p.h"
 
 #include "qtextdocument_p.h"
-#include <private/qprinter_p.h>
 #include <private/qabstracttextdocumentlayout_p.h>
 #include "qpagedpaintdevice.h"
 
diff --git a/src/modules/qt_gui.pri b/src/modules/qt_gui.pri
index 0d1b2109f8..1fd53e587c 100644
--- a/src/modules/qt_gui.pri
+++ b/src/modules/qt_gui.pri
@@ -10,5 +10,5 @@ QT.gui.sources = $$QT_MODULE_BASE/src/gui
 QT.gui.libs = $$QT_MODULE_LIB_BASE
 QT.gui.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.gui.imports = $$QT_MODULE_IMPORT_BASE
-QT.gui.depends = core network
+QT.gui.depends = core
 QT.gui.DEFINES = QT_GUI_LIB
diff --git a/src/modules/qt_printsupport.pri b/src/modules/qt_printsupport.pri
new file mode 100644
index 0000000000..85603296a6
--- /dev/null
+++ b/src/modules/qt_printsupport.pri
@@ -0,0 +1,14 @@
+QT.printsupport.VERSION = 5.0.0
+QT.printsupport.MAJOR_VERSION = 5
+QT.printsupport.MINOR_VERSION = 0
+QT.printsupport.PATCH_VERSION = 0
+
+QT.printsupport.name = QtPrintSupport
+QT.printsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport
+QT.printsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport/$$QT.printsupport.VERSION
+QT.printsupport.sources = $$QT_MODULE_BASE/src/printsupport
+QT.printsupport.libs = $$QT_MODULE_LIB_BASE
+QT.printsupport.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.printsupport.imports = $$QT_MODULE_IMPORT_BASE
+QT.printsupport.depends = core gui widgets
+QT.printsupport.DEFINES = QT_PRINTSUPPORT_LIB
diff --git a/src/platformsupport/printersupport/genericunix/genericunix.pri b/src/platformsupport/printersupport/genericunix/genericunix.pri
index 06bd1b6d21..55534c098e 100644
--- a/src/platformsupport/printersupport/genericunix/genericunix.pri
+++ b/src/platformsupport/printersupport/genericunix/genericunix.pri
@@ -1,2 +1,4 @@
+QT += printsupport printsupport-private
+
 HEADERS += $$PWD/qgenericunixprintersupport_p.h
 SOURCES += $$PWD/qgenericunixprintersupport.cpp
diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
index ae66ce859f..bac5ba20f0 100644
--- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
+++ b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
@@ -41,7 +41,7 @@
 
 #include "qgenericunixprintersupport_p.h"
 
-#include <QtGui/QPrinterInfo>
+#include <QtPrintSupport/QPrinterInfo>
 #include <private/qcups_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h
index 5d7b3b43fb..bcfc36799f 100644
--- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h
+++ b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h
@@ -42,7 +42,7 @@
 #ifndef QGENERICUNIXPRINTINGSUPPORT_H
 #define QGENERICUNIXPRINTINGSUPPORT_H
 
-#include <QtGui/QPlatformPrinterSupport>
+#include <QtPrintSupport/QPlatformPrinterSupport>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/printsupport/dialogs/dialogs.pri b/src/printsupport/dialogs/dialogs.pri
new file mode 100644
index 0000000000..5dbaa9fec3
--- /dev/null
+++ b/src/printsupport/dialogs/dialogs.pri
@@ -0,0 +1,43 @@
+# Qt dialogs module
+
+HEADERS += \
+        dialogs/qabstractprintdialog.h \
+        dialogs/qabstractprintdialog_p.h \
+        dialogs/qabstractpagesetupdialog.h \
+        dialogs/qabstractpagesetupdialog_p.h \
+        dialogs/qpagesetupdialog.h \
+        dialogs/qprintdialog.h \
+        dialogs/qprintpreviewdialog.h
+
+!qpa:mac {
+    OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
+                         dialogs/qprintdialog_mac.mm
+
+}
+
+win32 {
+    qpa:DEFINES += QT_NO_PRINTDIALOG
+
+    SOURCES += dialogs/qpagesetupdialog_win.cpp \
+               dialogs/qprintdialog_win.cpp
+}
+
+!mac:!symbian:unix|qpa:!win32 {
+        HEADERS += dialogs/qpagesetupdialog_unix_p.h
+        SOURCES += dialogs/qprintdialog_unix.cpp \
+                   dialogs/qpagesetupdialog_unix.cpp
+        FORMS += dialogs/qprintsettingsoutput.ui \
+        dialogs/qprintwidget.ui \
+        dialogs/qprintpropertieswidget.ui
+}
+
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+        dialogs/qabstractprintdialog.cpp \
+        dialogs/qabstractpagesetupdialog.cpp \
+        dialogs/qpagesetupdialog.cpp \
+        dialogs/qprintpreviewdialog.cpp
+
+FORMS += dialogs/qpagesetupwidget.ui
+RESOURCES += dialogs/qprintdialog.qrc
diff --git a/src/widgets/dialogs/images/fit-page-24.png b/src/printsupport/dialogs/images/fit-page-24.png
index c7b39d8853..c7b39d8853 100644
--- a/src/widgets/dialogs/images/fit-page-24.png
+++ b/src/printsupport/dialogs/images/fit-page-24.png
diff --git a/src/widgets/dialogs/images/fit-page-32.png b/src/printsupport/dialogs/images/fit-page-32.png
index 98bc12d3ed..98bc12d3ed 100644
--- a/src/widgets/dialogs/images/fit-page-32.png
+++ b/src/printsupport/dialogs/images/fit-page-32.png
diff --git a/src/widgets/dialogs/images/fit-width-24.png b/src/printsupport/dialogs/images/fit-width-24.png
index a729ffda54..a729ffda54 100644
--- a/src/widgets/dialogs/images/fit-width-24.png
+++ b/src/printsupport/dialogs/images/fit-width-24.png
diff --git a/src/widgets/dialogs/images/fit-width-32.png b/src/printsupport/dialogs/images/fit-width-32.png
index 470a8b45d0..470a8b45d0 100644
--- a/src/widgets/dialogs/images/fit-width-32.png
+++ b/src/printsupport/dialogs/images/fit-width-32.png
diff --git a/src/widgets/dialogs/images/go-first-24.png b/src/printsupport/dialogs/images/go-first-24.png
index 55315ffa38..55315ffa38 100644
--- a/src/widgets/dialogs/images/go-first-24.png
+++ b/src/printsupport/dialogs/images/go-first-24.png
diff --git a/src/widgets/dialogs/images/go-first-32.png b/src/printsupport/dialogs/images/go-first-32.png
index 0fe6f94b77..0fe6f94b77 100644
--- a/src/widgets/dialogs/images/go-first-32.png
+++ b/src/printsupport/dialogs/images/go-first-32.png
diff --git a/src/widgets/dialogs/images/go-last-24.png b/src/printsupport/dialogs/images/go-last-24.png
index 81061b80f2..81061b80f2 100644
--- a/src/widgets/dialogs/images/go-last-24.png
+++ b/src/printsupport/dialogs/images/go-last-24.png
diff --git a/src/widgets/dialogs/images/go-last-32.png b/src/printsupport/dialogs/images/go-last-32.png
index 887506107e..887506107e 100644
--- a/src/widgets/dialogs/images/go-last-32.png
+++ b/src/printsupport/dialogs/images/go-last-32.png
diff --git a/src/widgets/dialogs/images/go-next-24.png b/src/printsupport/dialogs/images/go-next-24.png
index 9a55ef3d86..9a55ef3d86 100644
--- a/src/widgets/dialogs/images/go-next-24.png
+++ b/src/printsupport/dialogs/images/go-next-24.png
diff --git a/src/widgets/dialogs/images/go-next-32.png b/src/printsupport/dialogs/images/go-next-32.png
index 6d98f50f4f..6d98f50f4f 100644
--- a/src/widgets/dialogs/images/go-next-32.png
+++ b/src/printsupport/dialogs/images/go-next-32.png
diff --git a/src/widgets/dialogs/images/go-previous-24.png b/src/printsupport/dialogs/images/go-previous-24.png
index 2ea769eb8d..2ea769eb8d 100644
--- a/src/widgets/dialogs/images/go-previous-24.png
+++ b/src/printsupport/dialogs/images/go-previous-24.png
diff --git a/src/widgets/dialogs/images/go-previous-32.png b/src/printsupport/dialogs/images/go-previous-32.png
index 37ba0c4e8d..37ba0c4e8d 100644
--- a/src/widgets/dialogs/images/go-previous-32.png
+++ b/src/printsupport/dialogs/images/go-previous-32.png
diff --git a/src/widgets/dialogs/images/layout-landscape-24.png b/src/printsupport/dialogs/images/layout-landscape-24.png
index 6f89a31cb6..6f89a31cb6 100644
--- a/src/widgets/dialogs/images/layout-landscape-24.png
+++ b/src/printsupport/dialogs/images/layout-landscape-24.png
diff --git a/src/widgets/dialogs/images/layout-landscape-32.png b/src/printsupport/dialogs/images/layout-landscape-32.png
index 6a94946c36..6a94946c36 100644
--- a/src/widgets/dialogs/images/layout-landscape-32.png
+++ b/src/printsupport/dialogs/images/layout-landscape-32.png
diff --git a/src/widgets/dialogs/images/layout-portrait-24.png b/src/printsupport/dialogs/images/layout-portrait-24.png
index e0dbabc83b..e0dbabc83b 100644
--- a/src/widgets/dialogs/images/layout-portrait-24.png
+++ b/src/printsupport/dialogs/images/layout-portrait-24.png
diff --git a/src/widgets/dialogs/images/layout-portrait-32.png b/src/printsupport/dialogs/images/layout-portrait-32.png
index d17468c0a4..d17468c0a4 100644
--- a/src/widgets/dialogs/images/layout-portrait-32.png
+++ b/src/printsupport/dialogs/images/layout-portrait-32.png
diff --git a/src/widgets/dialogs/images/page-setup-24.png b/src/printsupport/dialogs/images/page-setup-24.png
index 4bfafdace0..4bfafdace0 100644
--- a/src/widgets/dialogs/images/page-setup-24.png
+++ b/src/printsupport/dialogs/images/page-setup-24.png
diff --git a/src/widgets/dialogs/images/page-setup-32.png b/src/printsupport/dialogs/images/page-setup-32.png
index 2313b8fe3b..2313b8fe3b 100644
--- a/src/widgets/dialogs/images/page-setup-32.png
+++ b/src/printsupport/dialogs/images/page-setup-32.png
diff --git a/src/widgets/dialogs/images/print-24.png b/src/printsupport/dialogs/images/print-24.png
index c6bf3e8672..c6bf3e8672 100644
--- a/src/widgets/dialogs/images/print-24.png
+++ b/src/printsupport/dialogs/images/print-24.png
diff --git a/src/widgets/dialogs/images/print-32.png b/src/printsupport/dialogs/images/print-32.png
index 5830888653..5830888653 100644
--- a/src/widgets/dialogs/images/print-32.png
+++ b/src/printsupport/dialogs/images/print-32.png
diff --git a/src/widgets/dialogs/images/status-color.png b/src/printsupport/dialogs/images/status-color.png
index af3cbfa31c..af3cbfa31c 100644
--- a/src/widgets/dialogs/images/status-color.png
+++ b/src/printsupport/dialogs/images/status-color.png
diff --git a/src/widgets/dialogs/images/status-gray-scale.png b/src/printsupport/dialogs/images/status-gray-scale.png
index 4462588809..4462588809 100644
--- a/src/widgets/dialogs/images/status-gray-scale.png
+++ b/src/printsupport/dialogs/images/status-gray-scale.png
diff --git a/src/widgets/dialogs/images/view-page-multi-24.png b/src/printsupport/dialogs/images/view-page-multi-24.png
index 87241472ae..87241472ae 100644
--- a/src/widgets/dialogs/images/view-page-multi-24.png
+++ b/src/printsupport/dialogs/images/view-page-multi-24.png
diff --git a/src/widgets/dialogs/images/view-page-multi-32.png b/src/printsupport/dialogs/images/view-page-multi-32.png
index 130885a041..130885a041 100644
--- a/src/widgets/dialogs/images/view-page-multi-32.png
+++ b/src/printsupport/dialogs/images/view-page-multi-32.png
diff --git a/src/widgets/dialogs/images/view-page-one-24.png b/src/printsupport/dialogs/images/view-page-one-24.png
index 4c6457b892..4c6457b892 100644
--- a/src/widgets/dialogs/images/view-page-one-24.png
+++ b/src/printsupport/dialogs/images/view-page-one-24.png
diff --git a/src/widgets/dialogs/images/view-page-one-32.png b/src/printsupport/dialogs/images/view-page-one-32.png
index 537193984e..537193984e 100644
--- a/src/widgets/dialogs/images/view-page-one-32.png
+++ b/src/printsupport/dialogs/images/view-page-one-32.png
diff --git a/src/widgets/dialogs/images/view-page-sided-24.png b/src/printsupport/dialogs/images/view-page-sided-24.png
index 2131305c41..2131305c41 100644
--- a/src/widgets/dialogs/images/view-page-sided-24.png
+++ b/src/printsupport/dialogs/images/view-page-sided-24.png
diff --git a/src/widgets/dialogs/images/view-page-sided-32.png b/src/printsupport/dialogs/images/view-page-sided-32.png
index e4d63f9992..e4d63f9992 100644
--- a/src/widgets/dialogs/images/view-page-sided-32.png
+++ b/src/printsupport/dialogs/images/view-page-sided-32.png
diff --git a/src/widgets/dialogs/images/zoom-in-24.png b/src/printsupport/dialogs/images/zoom-in-24.png
index d29b142b6c..d29b142b6c 100644
--- a/src/widgets/dialogs/images/zoom-in-24.png
+++ b/src/printsupport/dialogs/images/zoom-in-24.png
diff --git a/src/widgets/dialogs/images/zoom-in-32.png b/src/printsupport/dialogs/images/zoom-in-32.png
index 34d70af37b..34d70af37b 100644
--- a/src/widgets/dialogs/images/zoom-in-32.png
+++ b/src/printsupport/dialogs/images/zoom-in-32.png
diff --git a/src/widgets/dialogs/images/zoom-out-24.png b/src/printsupport/dialogs/images/zoom-out-24.png
index 19703474f8..19703474f8 100644
--- a/src/widgets/dialogs/images/zoom-out-24.png
+++ b/src/printsupport/dialogs/images/zoom-out-24.png
diff --git a/src/widgets/dialogs/images/zoom-out-32.png b/src/printsupport/dialogs/images/zoom-out-32.png
index b832206612..b832206612 100644
--- a/src/widgets/dialogs/images/zoom-out-32.png
+++ b/src/printsupport/dialogs/images/zoom-out-32.png
diff --git a/src/widgets/dialogs/qabstractpagesetupdialog.cpp b/src/printsupport/dialogs/qabstractpagesetupdialog.cpp
index 7a0e0080b2..8268065bfd 100644
--- a/src/widgets/dialogs/qabstractpagesetupdialog.cpp
+++ b/src/printsupport/dialogs/qabstractpagesetupdialog.cpp
@@ -45,7 +45,7 @@
 #ifndef QT_NO_PRINTDIALOG
 
 #include <QtCore/qcoreapplication.h>
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qprinter.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/dialogs/qabstractpagesetupdialog.h b/src/printsupport/dialogs/qabstractpagesetupdialog.h
index a867a8155b..a867a8155b 100644
--- a/src/widgets/dialogs/qabstractpagesetupdialog.h
+++ b/src/printsupport/dialogs/qabstractpagesetupdialog.h
diff --git a/src/widgets/dialogs/qabstractpagesetupdialog_p.h b/src/printsupport/dialogs/qabstractpagesetupdialog_p.h
index 3a4711dd6b..3a4711dd6b 100644
--- a/src/widgets/dialogs/qabstractpagesetupdialog_p.h
+++ b/src/printsupport/dialogs/qabstractpagesetupdialog_p.h
diff --git a/src/widgets/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp
index ff572dd9f3..ff572dd9f3 100644
--- a/src/widgets/dialogs/qabstractprintdialog.cpp
+++ b/src/printsupport/dialogs/qabstractprintdialog.cpp
diff --git a/src/widgets/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h
index 29c05d544b..29c05d544b 100644
--- a/src/widgets/dialogs/qabstractprintdialog.h
+++ b/src/printsupport/dialogs/qabstractprintdialog.h
diff --git a/src/widgets/dialogs/qabstractprintdialog_p.h b/src/printsupport/dialogs/qabstractprintdialog_p.h
index 939e3f2804..45dd7e1e6a 100644
--- a/src/widgets/dialogs/qabstractprintdialog_p.h
+++ b/src/printsupport/dialogs/qabstractprintdialog_p.h
@@ -57,7 +57,7 @@
 
 #ifndef QT_NO_PRINTDIALOG
 
-#include "QtWidgets/qabstractprintdialog.h"
+#include "QtPrintSupport/qabstractprintdialog.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/dialogs/qpagesetupdialog.cpp b/src/printsupport/dialogs/qpagesetupdialog.cpp
index 658dfc1def..658dfc1def 100644
--- a/src/widgets/dialogs/qpagesetupdialog.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog.cpp
diff --git a/src/widgets/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h
index a41b46cf15..3e983d3d95 100644
--- a/src/widgets/dialogs/qpagesetupdialog.h
+++ b/src/printsupport/dialogs/qpagesetupdialog.h
@@ -42,7 +42,7 @@
 #ifndef QPAGESETUPDIALOG_H
 #define QPAGESETUPDIALOG_H
 
-#include <QtWidgets/qabstractpagesetupdialog.h>
+#include <QtPrintSupport/qabstractpagesetupdialog.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
index 725520116a..725520116a 100644
--- a/src/widgets/dialogs/qpagesetupdialog_mac.mm
+++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
diff --git a/src/widgets/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
index ff54e0a19b..e5b12f8ba5 100644
--- a/src/widgets/dialogs/qpagesetupdialog_unix.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
@@ -49,7 +49,7 @@
 #include "qdialogbuttonbox.h"
 #include <ui_qpagesetupwidget.h>
 
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qprinter.h>
 #include <private/qabstractpagesetupdialog_p.h>
 #include <private/qprinter_p.h>
 
diff --git a/src/widgets/dialogs/qpagesetupdialog_unix_p.h b/src/printsupport/dialogs/qpagesetupdialog_unix_p.h
index 2303db9fe8..2303db9fe8 100644
--- a/src/widgets/dialogs/qpagesetupdialog_unix_p.h
+++ b/src/printsupport/dialogs/qpagesetupdialog_unix_p.h
diff --git a/src/widgets/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp
index 2e7cf860fc..2e7cf860fc 100644
--- a/src/widgets/dialogs/qpagesetupdialog_win.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp
diff --git a/src/widgets/dialogs/qpagesetupwidget.ui b/src/printsupport/dialogs/qpagesetupwidget.ui
index ace2ab8f44..ace2ab8f44 100644
--- a/src/widgets/dialogs/qpagesetupwidget.ui
+++ b/src/printsupport/dialogs/qpagesetupwidget.ui
diff --git a/src/widgets/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h
index 1bde1d1deb..bb53ae6fd8 100644
--- a/src/widgets/dialogs/qprintdialog.h
+++ b/src/printsupport/dialogs/qprintdialog.h
@@ -42,7 +42,7 @@
 #ifndef QPRINTDIALOG_H
 #define QPRINTDIALOG_H
 
-#include <QtWidgets/qabstractprintdialog.h>
+#include <QtPrintSupport/qabstractprintdialog.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/dialogs/qprintdialog.qdoc b/src/printsupport/dialogs/qprintdialog.qdoc
index 53bbc9b490..53bbc9b490 100644
--- a/src/widgets/dialogs/qprintdialog.qdoc
+++ b/src/printsupport/dialogs/qprintdialog.qdoc
diff --git a/src/widgets/dialogs/qprintdialog.qrc b/src/printsupport/dialogs/qprintdialog.qrc
index f54eb6b5ee..f54eb6b5ee 100644
--- a/src/widgets/dialogs/qprintdialog.qrc
+++ b/src/printsupport/dialogs/qprintdialog.qrc
diff --git a/src/widgets/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm
index 2e902e61ce..2e902e61ce 100644
--- a/src/widgets/dialogs/qprintdialog_mac.mm
+++ b/src/printsupport/dialogs/qprintdialog_mac.mm
diff --git a/src/widgets/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index e1c1287a11..8da3665d56 100644
--- a/src/widgets/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -51,11 +51,11 @@
 #include <QtGui/qevent.h>
 #include <QtWidgets/qfilesystemmodel.h>
 #include <QtWidgets/qstyleditemdelegate.h>
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qprinter.h>
 
 #include <QtWidgets/qdialogbuttonbox.h>
 
-#include "qfscompleter_p.h"
+#include "private/qfscompleter_p.h"
 #include "ui_qprintpropertieswidget.h"
 #include "ui_qprintsettingsoutput.h"
 #include "ui_qprintwidget.h"
diff --git a/src/widgets/dialogs/qprintdialog_win.cpp b/src/printsupport/dialogs/qprintdialog_win.cpp
index c8d92d45f2..c8d92d45f2 100644
--- a/src/widgets/dialogs/qprintdialog_win.cpp
+++ b/src/printsupport/dialogs/qprintdialog_win.cpp
diff --git a/src/widgets/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index af53b9d980..55ebc194f2 100644
--- a/src/widgets/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -50,8 +50,8 @@
 #include <QtWidgets/qcombobox.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qlineedit.h>
-#include <QtWidgets/qpagesetupdialog.h>
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qpagesetupdialog.h>
+#include <QtPrintSupport/qprinter.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qtoolbutton.h>
 #include <QtGui/qvalidator.h>
diff --git a/src/widgets/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h
index fa67f02b93..fa67f02b93 100644
--- a/src/widgets/dialogs/qprintpreviewdialog.h
+++ b/src/printsupport/dialogs/qprintpreviewdialog.h
diff --git a/src/widgets/dialogs/qprintpropertieswidget.ui b/src/printsupport/dialogs/qprintpropertieswidget.ui
index 26fa09599e..26fa09599e 100644
--- a/src/widgets/dialogs/qprintpropertieswidget.ui
+++ b/src/printsupport/dialogs/qprintpropertieswidget.ui
diff --git a/src/widgets/dialogs/qprintsettingsoutput.ui b/src/printsupport/dialogs/qprintsettingsoutput.ui
index be916790fb..be916790fb 100644
--- a/src/widgets/dialogs/qprintsettingsoutput.ui
+++ b/src/printsupport/dialogs/qprintsettingsoutput.ui
diff --git a/src/widgets/dialogs/qprintwidget.ui b/src/printsupport/dialogs/qprintwidget.ui
index 8a4f3bde0a..8a4f3bde0a 100644
--- a/src/widgets/dialogs/qprintwidget.ui
+++ b/src/printsupport/dialogs/qprintwidget.ui
diff --git a/src/gui/printsupport/printsupport.pri b/src/printsupport/kernel/kernel.pri
index b4773216d5..3868d9e212 100644
--- a/src/gui/printsupport/printsupport.pri
+++ b/src/printsupport/kernel/kernel.pri
@@ -6,7 +6,8 @@ HEADERS += \
         $$PWD/qprinter_p.h \
         $$PWD/qprinterinfo.h \
         $$PWD/qprinterinfo_p.h \
-        $$PWD/qprintabletextdocument.h
+        $$PWD/qplatformprintplugin_qpa.h \
+        $$PWD/qplatformprintersupport_qpa.h
 
 SOURCES += \
         $$PWD/qpaintengine_alpha.cpp \
@@ -14,7 +15,8 @@ SOURCES += \
         $$PWD/qprintengine_pdf.cpp \
         $$PWD/qprinter.cpp \
         $$PWD/qprinterinfo.cpp \
-        $$PWD/qprintabletextdocument.cpp
+        $$PWD/qplatformprintplugin.cpp \
+        $$PWD/qplatformprintersupport_qpa.cpp
 
 unix:!symbian {
         HEADERS += \
@@ -23,12 +25,6 @@ unix:!symbian {
                 $$PWD/qprinterinfo_unix.cpp
 }
 
-qpa {
-        HEADERS += $$PWD/qplatformprintersupport_qpa.h
-        SOURCES += \
-                $$PWD/qplatformprintersupport_qpa.cpp
-}
-
 
 x11|qpa:!win32 {
         SOURCES += $$PWD/qcups.cpp
diff --git a/src/gui/printsupport/qcups.cpp b/src/printsupport/kernel/qcups.cpp
index 76050d9d71..76050d9d71 100644
--- a/src/gui/printsupport/qcups.cpp
+++ b/src/printsupport/kernel/qcups.cpp
diff --git a/src/gui/printsupport/qcups_p.h b/src/printsupport/kernel/qcups_p.h
index 6b6a55a440..33a4e264d7 100644
--- a/src/gui/printsupport/qcups_p.h
+++ b/src/printsupport/kernel/qcups_p.h
@@ -55,7 +55,7 @@
 #include "QtCore/qstring.h"
 #include "QtCore/qstringlist.h"
 #include "QtCore/qpair.h"
-#include "QtGui/qprinter.h"
+#include "QtPrintSupport/qprinter.h"
 
 #ifndef QT_NO_CUPS
 #include <QtCore/qlibrary.h>
diff --git a/src/gui/printsupport/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp
index beda2c7144..beda2c7144 100644
--- a/src/gui/printsupport/qpaintengine_alpha.cpp
+++ b/src/printsupport/kernel/qpaintengine_alpha.cpp
diff --git a/src/gui/printsupport/qpaintengine_alpha_p.h b/src/printsupport/kernel/qpaintengine_alpha_p.h
index 5694e2a5bc..5694e2a5bc 100644
--- a/src/gui/printsupport/qpaintengine_alpha_p.h
+++ b/src/printsupport/kernel/qpaintengine_alpha_p.h
diff --git a/src/gui/printsupport/qpaintengine_preview.cpp b/src/printsupport/kernel/qpaintengine_preview.cpp
index d3b7756516..3cf06f5770 100644
--- a/src/gui/printsupport/qpaintengine_preview.cpp
+++ b/src/printsupport/kernel/qpaintengine_preview.cpp
@@ -44,7 +44,7 @@
 #include <private/qpaintengine_p.h>
 #include <private/qpicture_p.h>
 
-#include <QtGui/qprintengine.h>
+#include <QtPrintSupport/qprintengine.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qpicture.h>
 
diff --git a/src/gui/printsupport/qpaintengine_preview_p.h b/src/printsupport/kernel/qpaintengine_preview_p.h
index 902a03bd8f..c2e11313c2 100644
--- a/src/gui/printsupport/qpaintengine_preview_p.h
+++ b/src/printsupport/kernel/qpaintengine_preview_p.h
@@ -55,7 +55,7 @@
 //
 
 #include <QtGui/qpaintengine.h>
-#include <QtGui/qprintengine.h>
+#include <QtPrintSupport/qprintengine.h>
 
 #ifndef QT_NO_PRINTPREVIEWWIDGET
 
diff --git a/src/gui/printsupport/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
index 9fb25c953f..3c11b3304c 100644
--- a/src/gui/printsupport/qplatformprintersupport_qpa.cpp
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
@@ -41,7 +41,7 @@
 
 #include "qplatformprintersupport_qpa.h"
 
-#include <QtGui/qprinterinfo.h>
+#include <QtPrintSupport/qprinterinfo.h>
 
 #include <private/qprinterinfo_p.h>
 
diff --git a/src/gui/printsupport/qplatformprintersupport_qpa.h b/src/printsupport/kernel/qplatformprintersupport_qpa.h
index 90dd260925..3fe4ff04ee 100644
--- a/src/gui/printsupport/qplatformprintersupport_qpa.h
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.h
@@ -42,7 +42,7 @@
 #ifndef QPLATFORMPRINTINGSUPPORT_H
 #define QPLATFORMPRINTINGSUPPORT_H
 
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qprinter.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp
new file mode 100644
index 0000000000..8b3c75127e
--- /dev/null
+++ b/src/printsupport/kernel/qplatformprintplugin.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qplatformprintplugin_qpa.h"
+#include "private/qfactoryloader_p.h"
+
+QT_BEGIN_NAMESPACE
+
+#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
+    (QPlatformPrinterSupportFactoryInterface_iid, QLatin1String("/printsupport"), Qt::CaseInsensitive))
+#endif
+
+QPlatformPrinterSupportPlugin::QPlatformPrinterSupportPlugin(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QPlatformPrinterSupportPlugin::~QPlatformPrinterSupportPlugin()
+{
+}
+
+QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get()
+{
+    QStringList k = loader()->keys();
+    if (k.isEmpty())
+        return 0;
+    QPlatformPrinterSupportPlugin *plugin = qobject_cast<QPlatformPrinterSupportPlugin *>(loader()->instance(k.first()));
+    if (!plugin)
+        return 0;
+    return plugin->create(k.first());
+}
+
+QT_END_NAMESPACE
diff --git a/src/printsupport/kernel/qplatformprintplugin_qpa.h b/src/printsupport/kernel/qplatformprintplugin_qpa.h
new file mode 100644
index 0000000000..7c7e32994e
--- /dev/null
+++ b/src/printsupport/kernel/qplatformprintplugin_qpa.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMPRINTERSUPPORTPLUGIN_H
+#define QPLATFORMPRINTERSUPPORTPLUGIN_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qplugin.h>
+#include <QtCore/qfactoryinterface.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QPlatformPrinterSupport;
+
+struct QPlatformPrinterSupportFactoryInterface : public QFactoryInterface
+{
+    virtual QPlatformPrinterSupport *create(const QString &key) = 0;
+};
+
+#define QPlatformPrinterSupportFactoryInterface_iid "org.qt-project.QPlatformPrinterSupportFactoryInterface"
+
+Q_DECLARE_INTERFACE(QPlatformPrinterSupportFactoryInterface, QPlatformPrinterSupportFactoryInterface_iid)
+
+class Q_GUI_EXPORT QPlatformPrinterSupportPlugin : public QObject, public QPlatformPrinterSupportFactoryInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QPlatformPrinterSupportFactoryInterface:QFactoryInterface)
+public:
+    explicit QPlatformPrinterSupportPlugin(QObject *parent = 0);
+    ~QPlatformPrinterSupportPlugin();
+
+    virtual QStringList keys() const = 0;
+    virtual QPlatformPrinterSupport *create(const QString &key) = 0;
+
+    static QPlatformPrinterSupport *get();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QPLATFORMPRINTERSUPPORTPLUGIN_H
diff --git a/src/gui/printsupport/qprintengine.h b/src/printsupport/kernel/qprintengine.h
index da4fe2ac68..550079defc 100644
--- a/src/gui/printsupport/qprintengine.h
+++ b/src/printsupport/kernel/qprintengine.h
@@ -43,7 +43,7 @@
 #define QPRINTENGINE_H
 
 #include <QtCore/qvariant.h>
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qprinter.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/printsupport/qprintengine_pdf.cpp b/src/printsupport/kernel/qprintengine_pdf.cpp
index 1f4baf14f1..eb1bf163d3 100644
--- a/src/gui/printsupport/qprintengine_pdf.cpp
+++ b/src/printsupport/kernel/qprintengine_pdf.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/qprintengine.h>
+#include <QtPrintSupport/qprintengine.h>
 
 #include <qiodevice.h>
 #include <qfile.h>
diff --git a/src/gui/printsupport/qprintengine_pdf_p.h b/src/printsupport/kernel/qprintengine_pdf_p.h
index 65e8428672..e27adda7b3 100644
--- a/src/gui/printsupport/qprintengine_pdf_p.h
+++ b/src/printsupport/kernel/qprintengine_pdf_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "QtGui/qprintengine.h"
+#include "QtPrintSupport/qprintengine.h"
 
 #ifndef QT_NO_PRINTER
 #include "QtCore/qmap.h"
diff --git a/src/gui/printsupport/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index 112f501e3f..72522b38c1 100644
--- a/src/gui/printsupport/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -53,7 +53,7 @@
 #ifndef QT_NO_PRINTER
 
 #include <private/qguiapplication_p.h>
-#include <QtGui/QPlatformPrinterSupport>
+#include <QtPrintSupport/QPlatformPrinterSupport>
 
 #if defined (Q_WS_WIN)
 #include <private/qprintengine_win_p.h>
diff --git a/src/gui/printsupport/qprinter.h b/src/printsupport/kernel/qprinter.h
index 2f91c8b1e9..2f91c8b1e9 100644
--- a/src/gui/printsupport/qprinter.h
+++ b/src/printsupport/kernel/qprinter.h
diff --git a/src/gui/printsupport/qprinter_p.h b/src/printsupport/kernel/qprinter_p.h
index 2ba0f0dbb8..1d5660e4d7 100644
--- a/src/gui/printsupport/qprinter_p.h
+++ b/src/printsupport/kernel/qprinter_p.h
@@ -58,8 +58,8 @@
 
 #ifndef QT_NO_PRINTER
 
-#include "QtGui/qprinter.h"
-#include "QtGui/qprintengine.h"
+#include "QtPrintSupport/qprinter.h"
+#include "QtPrintSupport/qprintengine.h"
 #include "QtCore/qpointer.h"
 
 #include <limits.h>
diff --git a/src/gui/printsupport/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp
index 0049bd248a..e48db449b5 100644
--- a/src/gui/printsupport/qprinterinfo.cpp
+++ b/src/printsupport/kernel/qprinterinfo.cpp
@@ -31,7 +31,7 @@
 #ifndef QT_NO_PRINTER
 
 #include <private/qguiapplication_p.h>
-#include <QtGui/QPlatformPrinterSupport>
+#include <QtPrintSupport/QPlatformPrinterSupport>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/printsupport/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h
index 72082cf299..f00503f2c2 100644
--- a/src/gui/printsupport/qprinterinfo.h
+++ b/src/printsupport/kernel/qprinterinfo.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QList>
 
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/printsupport/qprinterinfo_p.h b/src/printsupport/kernel/qprinterinfo_p.h
index a3c654e7b7..a3c654e7b7 100644
--- a/src/gui/printsupport/qprinterinfo_p.h
+++ b/src/printsupport/kernel/qprinterinfo_p.h
diff --git a/src/gui/printsupport/qprinterinfo_unix.cpp b/src/printsupport/kernel/qprinterinfo_unix.cpp
index 3c66481b4d..3c66481b4d 100644
--- a/src/gui/printsupport/qprinterinfo_unix.cpp
+++ b/src/printsupport/kernel/qprinterinfo_unix.cpp
diff --git a/src/gui/printsupport/qprinterinfo_unix_p.h b/src/printsupport/kernel/qprinterinfo_unix_p.h
index f8721deaa9..c12aa39556 100644
--- a/src/gui/printsupport/qprinterinfo_unix_p.h
+++ b/src/printsupport/kernel/qprinterinfo_unix_p.h
@@ -42,7 +42,7 @@
 #ifndef QPRINTERINFO_UNIX_P_H
 #define QPRINTERINFO_UNIX_P_H
 
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qprinter.h>
 #include <QtCore/qstringlist.h>
 
 #ifndef QT_NO_NIS
diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro
new file mode 100644
index 0000000000..0aa92a95de
--- /dev/null
+++ b/src/printsupport/printsupport.pro
@@ -0,0 +1,22 @@
+load(qt_module)
+
+TARGET     = QtPrintSupport
+QPRO_PWD   = $$PWD
+QT = core-private gui-private widgets-private
+
+CONFIG += module
+MODULE_PRI = ../modules/qt_printsupport.pri
+
+DEFINES   += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE
+
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
+
+load(qt_module_config)
+
+HEADERS += $$QT_SOURCE_TREE/src/printsupport/qtprintsupportversion.h
+
+QMAKE_LIBS += $$QMAKE_LIBS_PRINTSUPPORT
+
+include(kernel/kernel.pri)
+include(widgets/widgets.pri)
+include(dialogs/dialogs.pri)
diff --git a/src/widgets/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp
index 96b009f8c1..96b009f8c1 100644
--- a/src/widgets/widgets/qprintpreviewwidget.cpp
+++ b/src/printsupport/widgets/qprintpreviewwidget.cpp
diff --git a/src/widgets/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h
index 87c908a589..6a90755813 100644
--- a/src/widgets/widgets/qprintpreviewwidget.h
+++ b/src/printsupport/widgets/qprintpreviewwidget.h
@@ -43,7 +43,7 @@
 #define QPRINTPREVIEWWIDGET_H
 
 #include <QtWidgets/qwidget.h>
-#include <QtGui/qprinter.h>
+#include <QtPrintSupport/qprinter.h>
 
 #ifndef QT_NO_PRINTPREVIEWWIDGET
 
diff --git a/src/printsupport/widgets/widgets.pri b/src/printsupport/widgets/widgets.pri
new file mode 100644
index 0000000000..40eb306623
--- /dev/null
+++ b/src/printsupport/widgets/widgets.pri
@@ -0,0 +1,2 @@
+HEADERS += widgets/qprintpreviewwidget.h
+SOURCES += widgets/qprintpreviewwidget.cpp
diff --git a/src/src.pro b/src/src.pro
index e9e32db915..8c3c3cc0db 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,7 +10,7 @@ SRC_SUBDIRS += src_corelib
 !cross_compile {
     win32:!wince*: SRC_SUBDIRS += src_tools_idc
 }
-SRC_SUBDIRS += src_network src_sql src_gui src_xml src_uitools src_widgets src_testlib src_platformsupport
+SRC_SUBDIRS += src_network src_sql src_gui src_xml src_uitools src_printsupport src_widgets src_testlib src_platformsupport
 nacl: SRC_SUBDIRS -= src_network src_testlib
 !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
 contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui
@@ -48,6 +48,8 @@ src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins
 src_plugins.target = sub-plugins
 src_widgets.subdir = $$QT_SOURCE_TREE/src/widgets
 src_widgets.target = sub-widgets
+src_printsupport.subdir = $$QT_SOURCE_TREE/src/printsupport
+src_printsupport.target = sub-printsupport
 src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib
 src_testlib.target = sub-testlib
 src_platformsupport.subdir = $$QT_SOURCE_TREE/src/platformsupport
@@ -58,7 +60,8 @@ src_platformsupport.target = sub-platformsupport
 !wince*:!ordered:!symbian-abld:!symbian-sbsv2 {
    src_corelib.depends = src_tools_moc src_tools_rcc
    src_gui.depends = src_corelib
-   src_widgets.depends = src_corelib src_gui src_tools_uic
+   src_printsupport.depends = src_corelib src_gui
+   src_widgets.depends = src_corelib src_gui src_printsupport src_tools_uic
    embedded: src_gui.depends += src_network
    src_xml.depends = src_corelib
    src_uitools.depends = src_corelib src_widgets
diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri
index fdbca9122f..41d81b8afc 100644
--- a/src/widgets/dialogs/dialogs.pri
+++ b/src/widgets/dialogs/dialogs.pri
@@ -1,10 +1,6 @@
 # Qt dialogs module
 
 HEADERS += \
-	dialogs/qabstractprintdialog.h \
-	dialogs/qabstractprintdialog_p.h \
-	dialogs/qabstractpagesetupdialog.h \
-	dialogs/qabstractpagesetupdialog_p.h \
 	dialogs/qcolordialog.h \
 	dialogs/qcolordialog_p.h \
         dialogs/qfscompleter_p.h \
@@ -17,22 +13,17 @@ HEADERS += \
 	dialogs/qfontdialog_p.h \
 	dialogs/qinputdialog.h \
 	dialogs/qmessagebox.h \
-	dialogs/qpagesetupdialog.h \
-	dialogs/qprintdialog.h \
 	dialogs/qprogressdialog.h \
         dialogs/qsidebar_p.h \
         dialogs/qfilesystemmodel.h \
         dialogs/qfilesystemmodel_p.h \
         dialogs/qfileinfogatherer_p.h \
-	dialogs/qwizard.h \
-        dialogs/qprintpreviewdialog.h
+        dialogs/qwizard.h
 
 !qpa:mac {
     OBJECTIVE_SOURCES += dialogs/qfiledialog_mac.mm \
                          dialogs/qfontdialog_mac.mm \
-                         dialogs/qnspanelproxy_mac.mm \
-                         dialogs/qpagesetupdialog_mac.mm \
-                         dialogs/qprintdialog_mac.mm
+                         dialogs/qnspanelproxy_mac.mm
 
 # Compile qcolordialog_mac.mm with exception support, disregarding the -no-exceptions 
 # configure option. (qcolordialog_mac needs to catch exceptions thrown by cocoa)
@@ -56,29 +47,16 @@ win32 {
                dialogs/qfiledialog_win_p.h
     SOURCES += dialogs/qdialogsbinarycompat_win.cpp \
                dialogs/qfiledialog_win.cpp \
-               dialogs/qpagesetupdialog_win.cpp \
-               dialogs/qprintdialog_win.cpp \
                dialogs/qwizard_win.cpp
 
     !win32-borland:!wince*: LIBS += -lshell32 	# the filedialog needs this library
 }
 
-!mac:!symbian:unix|qpa:!win32 {
-        HEADERS += dialogs/qpagesetupdialog_unix_p.h
-	SOURCES += dialogs/qprintdialog_unix.cpp \
-		   dialogs/qpagesetupdialog_unix.cpp
-	FORMS += dialogs/qprintsettingsoutput.ui \
-        dialogs/qprintwidget.ui \
-        dialogs/qprintpropertieswidget.ui
-}
-
 wince*|symbian: FORMS += dialogs/qfiledialog_embedded.ui
 else: FORMS += dialogs/qfiledialog.ui
 
 INCLUDEPATH += $$PWD
 SOURCES += \
-	dialogs/qabstractprintdialog.cpp \
-	dialogs/qabstractpagesetupdialog.cpp \
 	dialogs/qcolordialog.cpp \
 	dialogs/qdialog.cpp \
 	dialogs/qerrormessage.cpp \
@@ -90,9 +68,7 @@ SOURCES += \
         dialogs/qsidebar.cpp \
         dialogs/qfilesystemmodel.cpp \
         dialogs/qfileinfogatherer.cpp \
-        dialogs/qpagesetupdialog.cpp \
 	dialogs/qwizard.cpp \
-        dialogs/qprintpreviewdialog.cpp
 
 symbian:contains(QT_CONFIG, s60) {
     LIBS += -lCommonDialogs
@@ -100,8 +76,6 @@ symbian:contains(QT_CONFIG, s60) {
                dialogs/qcolordialog_symbian.cpp
 }
 
-FORMS += dialogs/qpagesetupwidget.ui
-RESOURCES += dialogs/qprintdialog.qrc
 RESOURCES += dialogs/qmessagebox.qrc
 
 # Compensate for lack of platform defines in Symbian3
diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h
index a449f1926d..e078542cdc 100644
--- a/src/widgets/dialogs/qfscompleter_p.h
+++ b/src/widgets/dialogs/qfscompleter_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 /*!
     QCompleter that can deal with QFileSystemModel
   */
-class QFSCompleter :  public QCompleter {
+class Q_WIDGETS_EXPORT QFSCompleter :  public QCompleter {
 public:
     QFSCompleter(QFileSystemModel *model, QObject *parent = 0)
         : QCompleter(model, parent), proxyModel(0), sourceModel(model)
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index f5cb04ce80..a8ac1a1bc0 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -141,10 +141,6 @@ static void initResources()
 #endif
     Q_INIT_RESOURCE_EXTERN(qmessagebox)
     Q_INIT_RESOURCE(qmessagebox);
-#if !defined(QT_NO_PRINTDIALOG)
-    Q_INIT_RESOURCE_EXTERN(qprintdialog)
-    Q_INIT_RESOURCE(qprintdialog);
-#endif
 
 }
 
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 69c80238bf..e4b5478aef 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -81,8 +81,8 @@ HEADERS += \
         widgets/qwidgetlinecontrol_p.h \
         widgets/qtoolbararealayout_p.h \
         widgets/qplaintextedit.h \
-        widgets/qplaintextedit_p.h \
-        widgets/qprintpreviewwidget.h
+        widgets/qplaintextedit_p.h
+
 SOURCES += \
         widgets/qabstractbutton.cpp \
         widgets/qabstractslider.cpp \
@@ -142,8 +142,7 @@ SOURCES += \
         widgets/qwidgettextcontrol.cpp \
         widgets/qwidgetlinecontrol.cpp \
         widgets/qtoolbararealayout.cpp \
-        widgets/qplaintextedit.cpp \
-        widgets/qprintpreviewwidget.cpp
+        widgets/qplaintextedit.cpp
 
 !qpa:mac {
     HEADERS += widgets/qmacnativewidget_mac.h \
diff --git a/sync.profile b/sync.profile
index 6d88cedc35..c830612cd3 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,7 @@
 %modules = ( # path to module name map
     "QtGui" => "$basedir/src/gui",
     "QtWidgets" => "$basedir/src/widgets",
+    "QtPrintSupport" => "$basedir/src/printsupport",
     "QtOpenGL" => "$basedir/src/opengl",
     "QtCore" => "$basedir/src/corelib",
     "QtXml" => "$basedir/src/xml",
@@ -42,6 +43,7 @@
 %mastercontent = (
     "core" => "#include <QtCore/QtCore>\n",
     "gui" => "#include <QtGui/QtGui>\n",
+    "printsupport" => "#include <QtPrintSupport/QtPrintSupport>\n",
     "widgets" => "#include <QtWidgets/QtWidgets>\n",
     "network" => "#include <QtNetwork/QtNetwork>\n",
     "opengl" => "#include <QtOpenGL/QtOpenGL>\n",
@@ -53,6 +55,7 @@
     "QtCore" => "$basedir/src/modules/qt_core.pri",
     "QtDBus" => "$basedir/src/modules/qt_dbus.pri",
     "QtGui" => "$basedir/src/modules/qt_gui.pri",
+    "QtPrintSupport" => "$basedir/src/modules/qt_printsupport.pri",
     "QtWidgets" => "$basedir/src/modules/qt_widgets.pri",
     "QtNetwork" => "$basedir/src/modules/qt_network.pri",
     "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri",
diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/qprinter/qprinter.pro
index 52ffca08b7..cbe4ad7986 100644
--- a/tests/auto/qprinter/qprinter.pro
+++ b/tests/auto/qprinter/qprinter.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-QT += widgets
+QT += printsupport widgets
 SOURCES  += tst_qprinter.cpp
 
 mac*:CONFIG+=insignificant_test
diff --git a/tests/auto/qprinterinfo/qprinterinfo.pro b/tests/auto/qprinterinfo/qprinterinfo.pro
index ade217faf3..1bf799d6ce 100644
--- a/tests/auto/qprinterinfo/qprinterinfo.pro
+++ b/tests/auto/qprinterinfo/qprinterinfo.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qprinterinfo.cpp
 
-QT += network
+QT += printsupport network
 
 DEFINES += QT_USE_USING_NAMESPACE