move printing related files into their own directory

This is done to prepare the next step where we move
printing into it's own module.

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

22 files changed, 39 insertions, 82 deletions

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f1d5bbaea5..7466b13d03 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -21,6 +21,7 @@ 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/painting/painting.pri b/src/gui/painting/painting.pri
index 2925d6acce..b12b2216a7 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -14,8 +14,6 @@ HEADERS += \
         painting/qpaintdevice.h \
         painting/qpaintengine.h \
         painting/qpaintengine_p.h \
-        painting/qpaintengine_alpha_p.h \
-        painting/qpaintengine_preview_p.h \
         painting/qpaintengineex_p.h \
         painting/qpainter.h \
         painting/qpainter_p.h \
@@ -28,11 +26,6 @@ HEADERS += \
         painting/qpen.h \
         painting/qpolygon.h \
         painting/qpolygonclipper_p.h \
-        painting/qprintengine.h \
-        painting/qprinter.h \
-        painting/qprinter_p.h \
-        painting/qprinterinfo.h \
-        painting/qprinterinfo_p.h \
         painting/qrasterizer_p.h \
         painting/qregion.h \
         painting/qstroker_p.h \
@@ -45,6 +38,7 @@ HEADERS += \
 
 SOURCES += \
         painting/qbackingstore.cpp \
+        painting/qcolormap_qpa.cpp \
         painting/qbezier.cpp \
         painting/qblendfunctions.cpp \
         painting/qbrush.cpp \
@@ -57,9 +51,8 @@ SOURCES += \
         painting/qmemrotate.cpp \
         painting/qoutlinemapper.cpp \
         painting/qpaintdevice.cpp \
+        painting/qpaintdevice_qpa.cpp \
         painting/qpaintengine.cpp \
-        painting/qpaintengine_alpha.cpp \
-        painting/qpaintengine_preview.cpp \
         painting/qpaintengineex.cpp \
         painting/qpainter.cpp \
         painting/qpainterpath.cpp \
@@ -68,9 +61,6 @@ SOURCES += \
         painting/qpdfwriter.cpp \
         painting/qpen.cpp \
         painting/qpolygon.cpp \
-        painting/qprintengine_pdf.cpp \
-        painting/qprinter.cpp \
-        painting/qprinterinfo.cpp \
         painting/qrasterizer.cpp \
         painting/qregion.cpp \
         painting/qstroker.cpp \
@@ -97,77 +87,7 @@ SOURCES += \
                 painting/qpaintengine_blitter_p.h       \
                 painting/qblittable_p.h                 \
 
-win32:!qpa {
-        HEADERS += painting/qprintengine_win_p.h
 
-        SOURCES += \
-                painting/qcolormap_win.cpp \
-                painting/qpaintdevice_win.cpp \
-                painting/qprintengine_win.cpp
-
-        !win32-borland:!wince*:LIBS += -lmsimg32
-}
-
-
-unix:x11 {
-        HEADERS += \
-                painting/qpaintengine_x11_p.h
-
-        SOURCES += \
-                painting/qcolormap_x11.cpp \
-                painting/qpaintdevice_x11.cpp \
-                painting/qpaintengine_x11.cpp
-}
-
-!qpa:!x11:mac {
-        HEADERS += \
-                painting/qpaintengine_mac_p.h \
-                painting/qprintengine_mac_p.h
-
-        SOURCES += \
-                painting/qcolormap_mac.cpp \
-                painting/qpaintdevice_mac.cpp \
-                painting/qpaintengine_mac.cpp \
-                painting/qprinterinfo_mac.cpp
-        OBJECTIVE_SOURCES += \
-                painting/qprintengine_mac.mm \
-}
-
-unix:!symbian {
-        HEADERS += \
-                painting/qprinterinfo_unix_p.h
-        SOURCES += \
-                painting/qprinterinfo_unix.cpp
-}
-
-qpa {
-        HEADERS += painting/qplatformprintersupport_qpa.h
-        SOURCES += \
-                painting/qcolormap_qpa.cpp \
-                painting/qpaintdevice_qpa.cpp \
-                painting/qplatformprintersupport_qpa.cpp
-}
-
-symbian {
-        SOURCES += \
-				painting/qpaintengine_s60.cpp \
-                painting/qregion_s60.cpp \
-                painting/qcolormap_s60.cpp
-
-        HEADERS += \
-                painting/qpaintengine_s60_p.h
-}
-
-x11|qpa:!win32 {
-        contains(QT_CONFIG,qtopia) {
-            DEFINES += QT_NO_CUPS QT_NO_LPR
-        } else {
-            SOURCES += painting/qcups.cpp
-            HEADERS += painting/qcups_p.h
-        }
-} else {
-        DEFINES += QT_NO_CUPS QT_NO_LPR
-}
 
 if(mmx|3dnow|sse|sse2|iwmmxt) {
     HEADERS += painting/qdrawhelper_x86_p.h \
diff --git a/src/gui/printsupport/printsupport.pri b/src/gui/printsupport/printsupport.pri
new file mode 100644
index 0000000000..2faf36ff5b
--- /dev/null
+++ b/src/gui/printsupport/printsupport.pri
@@ -0,0 +1,36 @@
+HEADERS += \
+        $$PWD/qpaintengine_alpha_p.h \
+        $$PWD/qpaintengine_preview_p.h \
+        $$PWD/qprintengine.h \
+        $$PWD/qprinter.h \
+        $$PWD/qprinter_p.h \
+        $$PWD/qprinterinfo.h \
+        $$PWD/qprinterinfo_p.h
+
+SOURCES += \
+        $$PWD/qpaintengine_alpha.cpp \
+        $$PWD/qpaintengine_preview.cpp \
+        $$PWD/qprintengine_pdf.cpp \
+        $$PWD/qprinter.cpp \
+        $$PWD/qprinterinfo.cpp \
+
+unix:!symbian {
+        HEADERS += \
+                $$PWD/qprinterinfo_unix_p.h
+        SOURCES += \
+                $$PWD/qprinterinfo_unix.cpp
+}
+
+qpa {
+        HEADERS += $$PWD/qplatformprintersupport_qpa.h
+        SOURCES += \
+                $$PWD/qplatformprintersupport_qpa.cpp
+}
+
+
+x11|qpa:!win32 {
+        SOURCES += $$PWD/qcups.cpp
+        HEADERS += $$PWD/qcups_p.h
+} else {
+        DEFINES += QT_NO_CUPS QT_NO_LPR
+}
diff --git a/src/gui/painting/qcups.cpp b/src/gui/printsupport/qcups.cpp
index 76050d9d71..76050d9d71 100644
--- a/src/gui/painting/qcups.cpp
+++ b/src/gui/printsupport/qcups.cpp
diff --git a/src/gui/painting/qcups_p.h b/src/gui/printsupport/qcups_p.h
index 6b6a55a440..6b6a55a440 100644
--- a/src/gui/painting/qcups_p.h
+++ b/src/gui/printsupport/qcups_p.h
diff --git a/src/gui/painting/qpaintengine_alpha.cpp b/src/gui/printsupport/qpaintengine_alpha.cpp
index beda2c7144..beda2c7144 100644
--- a/src/gui/painting/qpaintengine_alpha.cpp
+++ b/src/gui/printsupport/qpaintengine_alpha.cpp
diff --git a/src/gui/painting/qpaintengine_alpha_p.h b/src/gui/printsupport/qpaintengine_alpha_p.h
index 5694e2a5bc..5694e2a5bc 100644
--- a/src/gui/painting/qpaintengine_alpha_p.h
+++ b/src/gui/printsupport/qpaintengine_alpha_p.h
diff --git a/src/gui/painting/qpaintengine_preview.cpp b/src/gui/printsupport/qpaintengine_preview.cpp
index d3b7756516..d3b7756516 100644
--- a/src/gui/painting/qpaintengine_preview.cpp
+++ b/src/gui/printsupport/qpaintengine_preview.cpp
diff --git a/src/gui/painting/qpaintengine_preview_p.h b/src/gui/printsupport/qpaintengine_preview_p.h
index 902a03bd8f..902a03bd8f 100644
--- a/src/gui/painting/qpaintengine_preview_p.h
+++ b/src/gui/printsupport/qpaintengine_preview_p.h
diff --git a/src/gui/painting/qplatformprintersupport_qpa.cpp b/src/gui/printsupport/qplatformprintersupport_qpa.cpp
index 9fb25c953f..9fb25c953f 100644
--- a/src/gui/painting/qplatformprintersupport_qpa.cpp
+++ b/src/gui/printsupport/qplatformprintersupport_qpa.cpp
diff --git a/src/gui/painting/qplatformprintersupport_qpa.h b/src/gui/printsupport/qplatformprintersupport_qpa.h
index 90dd260925..90dd260925 100644
--- a/src/gui/painting/qplatformprintersupport_qpa.h
+++ b/src/gui/printsupport/qplatformprintersupport_qpa.h
diff --git a/src/gui/painting/qprintengine.h b/src/gui/printsupport/qprintengine.h
index da4fe2ac68..da4fe2ac68 100644
--- a/src/gui/painting/qprintengine.h
+++ b/src/gui/printsupport/qprintengine.h
diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/printsupport/qprintengine_pdf.cpp
index df9a939e4b..df9a939e4b 100644
--- a/src/gui/painting/qprintengine_pdf.cpp
+++ b/src/gui/printsupport/qprintengine_pdf.cpp
diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/printsupport/qprintengine_pdf_p.h
index 367e3aebab..367e3aebab 100644
--- a/src/gui/painting/qprintengine_pdf_p.h
+++ b/src/gui/printsupport/qprintengine_pdf_p.h
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/printsupport/qprinter.cpp
index bdbddf20c4..bdbddf20c4 100644
--- a/src/gui/painting/qprinter.cpp
+++ b/src/gui/printsupport/qprinter.cpp
diff --git a/src/gui/painting/qprinter.h b/src/gui/printsupport/qprinter.h
index d551489bb8..d551489bb8 100644
--- a/src/gui/painting/qprinter.h
+++ b/src/gui/printsupport/qprinter.h
diff --git a/src/gui/painting/qprinter_p.h b/src/gui/printsupport/qprinter_p.h
index 2ba0f0dbb8..2ba0f0dbb8 100644
--- a/src/gui/painting/qprinter_p.h
+++ b/src/gui/printsupport/qprinter_p.h
diff --git a/src/gui/painting/qprinterinfo.cpp b/src/gui/printsupport/qprinterinfo.cpp
index 0049bd248a..0049bd248a 100644
--- a/src/gui/painting/qprinterinfo.cpp
+++ b/src/gui/printsupport/qprinterinfo.cpp
diff --git a/src/gui/painting/qprinterinfo.h b/src/gui/printsupport/qprinterinfo.h
index 72082cf299..72082cf299 100644
--- a/src/gui/painting/qprinterinfo.h
+++ b/src/gui/printsupport/qprinterinfo.h
diff --git a/src/gui/painting/qprinterinfo_p.h b/src/gui/printsupport/qprinterinfo_p.h
index a3c654e7b7..a3c654e7b7 100644
--- a/src/gui/painting/qprinterinfo_p.h
+++ b/src/gui/printsupport/qprinterinfo_p.h
diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/printsupport/qprinterinfo_unix.cpp
index 3c66481b4d..3c66481b4d 100644
--- a/src/gui/painting/qprinterinfo_unix.cpp
+++ b/src/gui/printsupport/qprinterinfo_unix.cpp
diff --git a/src/gui/painting/qprinterinfo_unix_p.h b/src/gui/printsupport/qprinterinfo_unix_p.h
index f8721deaa9..f8721deaa9 100644
--- a/src/gui/painting/qprinterinfo_unix_p.h
+++ b/src/gui/printsupport/qprinterinfo_unix_p.h