From 041abb93169668b8f6ebac128050d4507e000e16 Mon Sep 17 00:00:00 2001 From: John Layt Date: Sun, 29 Jul 2012 16:27:21 +0100 Subject: [PATCH] QPrintSupport: Move QAbstractPrintDialog test into QPrintSupport Move the test for QAbstractPrintDialog from widgets into printsupport Change-Id: Ia7595fa650a7ad565df3090207500ed06564e842 Reviewed-by: Marc Mutz --- tests/auto/printsupport/dialogs/dialogs.pro | 3 +++ .../dialogs/qabstractprintdialog/.gitignore | 0 .../dialogs/qabstractprintdialog/qabstractprintdialog.pro | 0 .../dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp | 0 tests/auto/printsupport/printsupport.pro | 1 + tests/auto/widgets/dialogs/dialogs.pro | 3 --- 6 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 tests/auto/printsupport/dialogs/dialogs.pro rename tests/auto/{widgets => printsupport}/dialogs/qabstractprintdialog/.gitignore (100%) rename tests/auto/{widgets => printsupport}/dialogs/qabstractprintdialog/qabstractprintdialog.pro (100%) rename tests/auto/{widgets => printsupport}/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp (100%) diff --git a/tests/auto/printsupport/dialogs/dialogs.pro b/tests/auto/printsupport/dialogs/dialogs.pro new file mode 100644 index 0000000000..419bd13ccf --- /dev/null +++ b/tests/auto/printsupport/dialogs/dialogs.pro @@ -0,0 +1,3 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qabstractprintdialog \ diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore b/tests/auto/printsupport/dialogs/qabstractprintdialog/.gitignore similarity index 100% rename from tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore rename to tests/auto/printsupport/dialogs/qabstractprintdialog/.gitignore diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/printsupport/dialogs/qabstractprintdialog/qabstractprintdialog.pro similarity index 100% rename from tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro rename to tests/auto/printsupport/dialogs/qabstractprintdialog/qabstractprintdialog.pro diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp similarity index 100% rename from tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp rename to tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp diff --git a/tests/auto/printsupport/printsupport.pro b/tests/auto/printsupport/printsupport.pro index 69ba296738..062f46980a 100644 --- a/tests/auto/printsupport/printsupport.pro +++ b/tests/auto/printsupport/printsupport.pro @@ -1,3 +1,4 @@ TEMPLATE=subdirs SUBDIRS=\ + dialogs \ kernel \ diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index acff1df5ba..c5f2c409dd 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -1,6 +1,5 @@ TEMPLATE=subdirs SUBDIRS=\ - qabstractprintdialog \ qcolordialog \ qdialog \ qerrormessage \ @@ -14,8 +13,6 @@ SUBDIRS=\ qsidebar \ qwizard \ -wince*|!qtHaveModule(printsupport):SUBDIRS -= qabstractprintdialog - !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qsidebar \