summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDebao Zhang <dbzhang800@gmail.com>2012-03-09 18:43:21 -0800
committerQt by Nokia <qt-info@nokia.com>2012-03-12 13:14:05 +0100
commit4eeb07d886940087de85ba1c4a12e634f35d8d9d (patch)
tree49eb766ebd05f2005376ca90105d7eb1b9ed0117 /tests
parent57cf7c8a1bb1905294038ba5c98f1e8235fc08af (diff)
Move tst_qprinter.cpp to QtPrintSupport
QPrinter and QPrinterInfo belong to QtPrintSupport. Change-Id: I0c146e0c717be365e752c1eaf7dbe6765fb72da2 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro1
-rw-r--r--tests/auto/gui/painting/painting.pro2
-rw-r--r--tests/auto/printsupport/kernel/kernel.pro4
-rw-r--r--tests/auto/printsupport/kernel/qprinter/.gitignore (renamed from tests/auto/gui/painting/qprinter/.gitignore)0
-rw-r--r--tests/auto/printsupport/kernel/qprinter/qprinter.pro (renamed from tests/auto/gui/painting/qprinter/qprinter.pro)0
-rw-r--r--tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp (renamed from tests/auto/gui/painting/qprinter/tst_qprinter.cpp)0
-rw-r--r--tests/auto/printsupport/kernel/qprinterinfo/.gitignore (renamed from tests/auto/gui/painting/qprinterinfo/.gitignore)0
-rw-r--r--tests/auto/printsupport/kernel/qprinterinfo/qprinterinfo.pro (renamed from tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro)0
-rw-r--r--tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp (renamed from tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp)0
-rw-r--r--tests/auto/printsupport/printsupport.pro3
10 files changed, 8 insertions, 2 deletions
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
index 85de0e9675..85de0e9675 100644
--- a/tests/auto/gui/painting/qprinter/.gitignore
+++ b/tests/auto/printsupport/kernel/qprinter/.gitignore
diff --git a/tests/auto/gui/painting/qprinter/qprinter.pro b/tests/auto/printsupport/kernel/qprinter/qprinter.pro
index 7543e91f8c..7543e91f8c 100644
--- a/tests/auto/gui/painting/qprinter/qprinter.pro
+++ b/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
index 3460ad702b..3460ad702b 100644
--- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
diff --git a/tests/auto/gui/painting/qprinterinfo/.gitignore b/tests/auto/printsupport/kernel/qprinterinfo/.gitignore
index fcef7c1997..fcef7c1997 100644
--- a/tests/auto/gui/painting/qprinterinfo/.gitignore
+++ b/tests/auto/printsupport/kernel/qprinterinfo/.gitignore
diff --git a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro b/tests/auto/printsupport/kernel/qprinterinfo/qprinterinfo.pro
index 88cb07f338..88cb07f338 100644
--- a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro
+++ b/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
index 2323dc8df3..2323dc8df3 100644
--- a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
+++ b/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 \