From 4eeb07d886940087de85ba1c4a12e634f35d8d9d Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Fri, 9 Mar 2012 18:43:21 -0800 Subject: [PATCH] Move tst_qprinter.cpp to QtPrintSupport QPrinter and QPrinterInfo belong to QtPrintSupport. Change-Id: I0c146e0c717be365e752c1eaf7dbe6765fb72da2 Reviewed-by: Gunnar Sletta Reviewed-by: Friedemann Kleint --- tests/auto/auto.pro | 1 + tests/auto/gui/painting/painting.pro | 2 -- tests/auto/printsupport/kernel/kernel.pro | 4 ++++ .../{gui/painting => printsupport/kernel}/qprinter/.gitignore | 0 .../painting => printsupport/kernel}/qprinter/qprinter.pro | 0 .../kernel}/qprinter/tst_qprinter.cpp | 0 .../painting => printsupport/kernel}/qprinterinfo/.gitignore | 0 .../kernel}/qprinterinfo/qprinterinfo.pro | 0 .../kernel}/qprinterinfo/tst_qprinterinfo.cpp | 0 tests/auto/printsupport/printsupport.pro | 3 +++ 10 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 tests/auto/printsupport/kernel/kernel.pro rename tests/auto/{gui/painting => printsupport/kernel}/qprinter/.gitignore (100%) rename tests/auto/{gui/painting => printsupport/kernel}/qprinter/qprinter.pro (100%) rename tests/auto/{gui/painting => printsupport/kernel}/qprinter/tst_qprinter.cpp (100%) rename tests/auto/{gui/painting => printsupport/kernel}/qprinterinfo/.gitignore (100%) rename tests/auto/{gui/painting => printsupport/kernel}/qprinterinfo/qprinterinfo.pro (100%) rename tests/auto/{gui/painting => printsupport/kernel}/qprinterinfo/tst_qprinterinfo.cpp (100%) create mode 100644 tests/auto/printsupport/printsupport.pro diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 63c4ca6a48..124af19799 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -13,6 +13,7 @@ SUBDIRS += \ concurrent \ other \ widgets \ + printsupport \ cross_compile: SUBDIRS -= tools !contains(QT_CONFIG, opengl): SUBDIRS -= opengl diff --git a/tests/auto/gui/painting/painting.pro b/tests/auto/gui/painting/painting.pro index 62230eeac7..8f018fd921 100644 --- a/tests/auto/gui/painting/painting.pro +++ b/tests/auto/gui/painting/painting.pro @@ -7,12 +7,10 @@ SUBDIRS=\ qregion \ qpainter \ qpathclipper \ - qprinterinfo \ qpen \ qpaintengine \ qtransform \ qwmatrix \ - qprinter \ qpolygon \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/printsupport/kernel/kernel.pro b/tests/auto/printsupport/kernel/kernel.pro new file mode 100644 index 0000000000..6f5802bf3e --- /dev/null +++ b/tests/auto/printsupport/kernel/kernel.pro @@ -0,0 +1,4 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qprinter \ + qprinterinfo \ diff --git a/tests/auto/gui/painting/qprinter/.gitignore b/tests/auto/printsupport/kernel/qprinter/.gitignore similarity index 100% rename from tests/auto/gui/painting/qprinter/.gitignore rename to tests/auto/printsupport/kernel/qprinter/.gitignore diff --git a/tests/auto/gui/painting/qprinter/qprinter.pro b/tests/auto/printsupport/kernel/qprinter/qprinter.pro similarity index 100% rename from tests/auto/gui/painting/qprinter/qprinter.pro rename to tests/auto/printsupport/kernel/qprinter/qprinter.pro diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp similarity index 100% rename from tests/auto/gui/painting/qprinter/tst_qprinter.cpp rename to tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp diff --git a/tests/auto/gui/painting/qprinterinfo/.gitignore b/tests/auto/printsupport/kernel/qprinterinfo/.gitignore similarity index 100% rename from tests/auto/gui/painting/qprinterinfo/.gitignore rename to tests/auto/printsupport/kernel/qprinterinfo/.gitignore diff --git a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro b/tests/auto/printsupport/kernel/qprinterinfo/qprinterinfo.pro similarity index 100% rename from tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro rename to tests/auto/printsupport/kernel/qprinterinfo/qprinterinfo.pro diff --git a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp similarity index 100% rename from tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp rename to tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp diff --git a/tests/auto/printsupport/printsupport.pro b/tests/auto/printsupport/printsupport.pro new file mode 100644 index 0000000000..69ba296738 --- /dev/null +++ b/tests/auto/printsupport/printsupport.pro @@ -0,0 +1,3 @@ +TEMPLATE=subdirs +SUBDIRS=\ + kernel \