From 64f94fa373900aca357f5f94c5ef16f481dc11b7 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 16 Aug 2011 13:53:57 +0200 Subject: [PATCH] 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 Reviewed-by: Gunnar Sletta --- src/gui/gui.pro | 1 + src/gui/painting/painting.pri | 84 +------------------ src/gui/printsupport/printsupport.pri | 36 ++++++++ src/gui/{painting => printsupport}/qcups.cpp | 0 src/gui/{painting => printsupport}/qcups_p.h | 0 .../qpaintengine_alpha.cpp | 0 .../qpaintengine_alpha_p.h | 0 .../qpaintengine_preview.cpp | 0 .../qpaintengine_preview_p.h | 0 .../qplatformprintersupport_qpa.cpp | 0 .../qplatformprintersupport_qpa.h | 0 .../{painting => printsupport}/qprintengine.h | 0 .../qprintengine_pdf.cpp | 0 .../qprintengine_pdf_p.h | 0 .../{painting => printsupport}/qprinter.cpp | 0 src/gui/{painting => printsupport}/qprinter.h | 0 .../{painting => printsupport}/qprinter_p.h | 0 .../qprinterinfo.cpp | 0 .../{painting => printsupport}/qprinterinfo.h | 0 .../qprinterinfo_p.h | 0 .../qprinterinfo_unix.cpp | 0 .../qprinterinfo_unix_p.h | 0 22 files changed, 39 insertions(+), 82 deletions(-) create mode 100644 src/gui/printsupport/printsupport.pri rename src/gui/{painting => printsupport}/qcups.cpp (100%) rename src/gui/{painting => printsupport}/qcups_p.h (100%) rename src/gui/{painting => printsupport}/qpaintengine_alpha.cpp (100%) rename src/gui/{painting => printsupport}/qpaintengine_alpha_p.h (100%) rename src/gui/{painting => printsupport}/qpaintengine_preview.cpp (100%) rename src/gui/{painting => printsupport}/qpaintengine_preview_p.h (100%) rename src/gui/{painting => printsupport}/qplatformprintersupport_qpa.cpp (100%) rename src/gui/{painting => printsupport}/qplatformprintersupport_qpa.h (100%) rename src/gui/{painting => printsupport}/qprintengine.h (100%) rename src/gui/{painting => printsupport}/qprintengine_pdf.cpp (100%) rename src/gui/{painting => printsupport}/qprintengine_pdf_p.h (100%) rename src/gui/{painting => printsupport}/qprinter.cpp (100%) rename src/gui/{painting => printsupport}/qprinter.h (100%) rename src/gui/{painting => printsupport}/qprinter_p.h (100%) rename src/gui/{painting => printsupport}/qprinterinfo.cpp (100%) rename src/gui/{painting => printsupport}/qprinterinfo.h (100%) rename src/gui/{painting => printsupport}/qprinterinfo_p.h (100%) rename src/gui/{painting => printsupport}/qprinterinfo_unix.cpp (100%) rename src/gui/{painting => printsupport}/qprinterinfo_unix_p.h (100%) diff --git a/src/gui/gui.pro b/src/gui/gui.pro index f1d5bbaea5d..7466b13d030 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 2925d6acce4..b12b2216a77 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 00000000000..2faf36ff5bf --- /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 similarity index 100% rename from src/gui/painting/qcups.cpp rename to src/gui/printsupport/qcups.cpp diff --git a/src/gui/painting/qcups_p.h b/src/gui/printsupport/qcups_p.h similarity index 100% rename from src/gui/painting/qcups_p.h rename to src/gui/printsupport/qcups_p.h diff --git a/src/gui/painting/qpaintengine_alpha.cpp b/src/gui/printsupport/qpaintengine_alpha.cpp similarity index 100% rename from src/gui/painting/qpaintengine_alpha.cpp rename to src/gui/printsupport/qpaintengine_alpha.cpp diff --git a/src/gui/painting/qpaintengine_alpha_p.h b/src/gui/printsupport/qpaintengine_alpha_p.h similarity index 100% rename from src/gui/painting/qpaintengine_alpha_p.h rename to src/gui/printsupport/qpaintengine_alpha_p.h diff --git a/src/gui/painting/qpaintengine_preview.cpp b/src/gui/printsupport/qpaintengine_preview.cpp similarity index 100% rename from src/gui/painting/qpaintengine_preview.cpp rename to src/gui/printsupport/qpaintengine_preview.cpp diff --git a/src/gui/painting/qpaintengine_preview_p.h b/src/gui/printsupport/qpaintengine_preview_p.h similarity index 100% rename from src/gui/painting/qpaintengine_preview_p.h rename to src/gui/printsupport/qpaintengine_preview_p.h diff --git a/src/gui/painting/qplatformprintersupport_qpa.cpp b/src/gui/printsupport/qplatformprintersupport_qpa.cpp similarity index 100% rename from src/gui/painting/qplatformprintersupport_qpa.cpp rename to src/gui/printsupport/qplatformprintersupport_qpa.cpp diff --git a/src/gui/painting/qplatformprintersupport_qpa.h b/src/gui/printsupport/qplatformprintersupport_qpa.h similarity index 100% rename from src/gui/painting/qplatformprintersupport_qpa.h rename to src/gui/printsupport/qplatformprintersupport_qpa.h diff --git a/src/gui/painting/qprintengine.h b/src/gui/printsupport/qprintengine.h similarity index 100% rename from src/gui/painting/qprintengine.h rename to src/gui/printsupport/qprintengine.h diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/printsupport/qprintengine_pdf.cpp similarity index 100% rename from src/gui/painting/qprintengine_pdf.cpp rename to src/gui/printsupport/qprintengine_pdf.cpp diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/printsupport/qprintengine_pdf_p.h similarity index 100% rename from src/gui/painting/qprintengine_pdf_p.h rename to src/gui/printsupport/qprintengine_pdf_p.h diff --git a/src/gui/painting/qprinter.cpp b/src/gui/printsupport/qprinter.cpp similarity index 100% rename from src/gui/painting/qprinter.cpp rename to src/gui/printsupport/qprinter.cpp diff --git a/src/gui/painting/qprinter.h b/src/gui/printsupport/qprinter.h similarity index 100% rename from src/gui/painting/qprinter.h rename to src/gui/printsupport/qprinter.h diff --git a/src/gui/painting/qprinter_p.h b/src/gui/printsupport/qprinter_p.h similarity index 100% rename from src/gui/painting/qprinter_p.h rename to src/gui/printsupport/qprinter_p.h diff --git a/src/gui/painting/qprinterinfo.cpp b/src/gui/printsupport/qprinterinfo.cpp similarity index 100% rename from src/gui/painting/qprinterinfo.cpp rename to src/gui/printsupport/qprinterinfo.cpp diff --git a/src/gui/painting/qprinterinfo.h b/src/gui/printsupport/qprinterinfo.h similarity index 100% rename from src/gui/painting/qprinterinfo.h rename to src/gui/printsupport/qprinterinfo.h diff --git a/src/gui/painting/qprinterinfo_p.h b/src/gui/printsupport/qprinterinfo_p.h similarity index 100% rename from src/gui/painting/qprinterinfo_p.h rename to src/gui/printsupport/qprinterinfo_p.h diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/printsupport/qprinterinfo_unix.cpp similarity index 100% rename from src/gui/painting/qprinterinfo_unix.cpp rename to src/gui/printsupport/qprinterinfo_unix.cpp diff --git a/src/gui/painting/qprinterinfo_unix_p.h b/src/gui/printsupport/qprinterinfo_unix_p.h similarity index 100% rename from src/gui/painting/qprinterinfo_unix_p.h rename to src/gui/printsupport/qprinterinfo_unix_p.h