From 2e886cfbcb0ae80a3545943d917352eb54804e98 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Thu, 8 Mar 2012 16:05:03 -0800 Subject: [PATCH] Move tst_qicon.cpp and tst_qpixmapfilter.cpp to QtWidgets QIcon and QPixmapFilter belong to QtWidgets instead of QtGui. Change-Id: I6d82811e04046edb0cc67c55970c161612e86d3f Reviewed-by: Sergio Ahumada Reviewed-by: Gunnar Sletta Reviewed-by: Friedemann Kleint --- tests/auto/gui/image/image.pro | 2 -- tests/auto/widgets/effects/effects.pro | 1 + .../effects}/qpixmapfilter/noise.png | Bin .../effects}/qpixmapfilter/qpixmapfilter.pro | 0 .../effects}/qpixmapfilter/tst_qpixmapfilter.cpp | 0 tests/auto/widgets/kernel/kernel.pro | 1 + .../{gui/image => widgets/kernel}/qicon/.gitignore | 0 .../testtheme/16x16/actions/appointment-new.png | Bin .../testtheme/22x22/actions/appointment-new.png | Bin .../testtheme/32x32/actions/appointment-new.png | Bin .../kernel}/qicon/icons/testtheme/index.theme | 0 .../icons/testtheme/scalable/actions/svg-only.svg | 0 .../themeparent/16x16/actions/address-book-new.png | Bin .../themeparent/16x16/actions/appointment-new.png | Bin .../themeparent/22x22/actions/address-book-new.png | Bin .../themeparent/22x22/actions/appointment-new.png | Bin .../themeparent/32x32/actions/address-book-new.png | Bin .../themeparent/32x32/actions/appointment-new.png | Bin .../kernel}/qicon/icons/themeparent/index.theme | 0 .../scalable/actions/address-book-new.svg | 0 .../scalable/actions/appointment-new.svg | 0 .../{gui/image => widgets/kernel}/qicon/image.png | Bin .../{gui/image => widgets/kernel}/qicon/qicon.pro | 0 .../{gui/image => widgets/kernel}/qicon/rect.png | Bin .../image => widgets/kernel}/qicon/tst_qicon.cpp | 0 .../image => widgets/kernel}/qicon/tst_qicon.qrc | 0 26 files changed, 2 insertions(+), 2 deletions(-) rename tests/auto/{gui/image => widgets/effects}/qpixmapfilter/noise.png (100%) rename tests/auto/{gui/image => widgets/effects}/qpixmapfilter/qpixmapfilter.pro (100%) rename tests/auto/{gui/image => widgets/effects}/qpixmapfilter/tst_qpixmapfilter.cpp (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/.gitignore (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/testtheme/16x16/actions/appointment-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/testtheme/22x22/actions/appointment-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/testtheme/32x32/actions/appointment-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/testtheme/index.theme (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/testtheme/scalable/actions/svg-only.svg (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/16x16/actions/address-book-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/16x16/actions/appointment-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/22x22/actions/address-book-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/22x22/actions/appointment-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/32x32/actions/address-book-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/32x32/actions/appointment-new.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/index.theme (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/scalable/actions/address-book-new.svg (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/icons/themeparent/scalable/actions/appointment-new.svg (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/image.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/qicon.pro (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/rect.png (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/tst_qicon.cpp (100%) rename tests/auto/{gui/image => widgets/kernel}/qicon/tst_qicon.qrc (100%) diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro index fa8f8df29d..5a03063f47 100644 --- a/tests/auto/gui/image/image.pro +++ b/tests/auto/gui/image/image.pro @@ -5,11 +5,9 @@ SUBDIRS=\ qpixmap \ qpixmapcache \ qimage \ - qpixmapfilter \ qimageiohandler \ qimagewriter \ qmovie \ - qicon \ qpicture \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/widgets/effects/effects.pro b/tests/auto/widgets/effects/effects.pro index fab24d6296..e598707f3e 100644 --- a/tests/auto/widgets/effects/effects.pro +++ b/tests/auto/widgets/effects/effects.pro @@ -1,4 +1,5 @@ TEMPLATE=subdirs SUBDIRS=\ qgraphicseffect \ + qpixmapfilter \ diff --git a/tests/auto/gui/image/qpixmapfilter/noise.png b/tests/auto/widgets/effects/qpixmapfilter/noise.png similarity index 100% rename from tests/auto/gui/image/qpixmapfilter/noise.png rename to tests/auto/widgets/effects/qpixmapfilter/noise.png diff --git a/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro b/tests/auto/widgets/effects/qpixmapfilter/qpixmapfilter.pro similarity index 100% rename from tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro rename to tests/auto/widgets/effects/qpixmapfilter/qpixmapfilter.pro diff --git a/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp similarity index 100% rename from tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp rename to tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro index 850863c112..3a00300ac3 100644 --- a/tests/auto/widgets/kernel/kernel.pro +++ b/tests/auto/widgets/kernel/kernel.pro @@ -13,6 +13,7 @@ SUBDIRS=\ qwidget \ qwidget_window \ qwidgetaction \ + qicon \ SUBDIRS -= qsound diff --git a/tests/auto/gui/image/qicon/.gitignore b/tests/auto/widgets/kernel/qicon/.gitignore similarity index 100% rename from tests/auto/gui/image/qicon/.gitignore rename to tests/auto/widgets/kernel/qicon/.gitignore diff --git a/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/widgets/kernel/qicon/icons/testtheme/16x16/actions/appointment-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png rename to tests/auto/widgets/kernel/qicon/icons/testtheme/16x16/actions/appointment-new.png diff --git a/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/widgets/kernel/qicon/icons/testtheme/22x22/actions/appointment-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png rename to tests/auto/widgets/kernel/qicon/icons/testtheme/22x22/actions/appointment-new.png diff --git a/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png b/tests/auto/widgets/kernel/qicon/icons/testtheme/32x32/actions/appointment-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png rename to tests/auto/widgets/kernel/qicon/icons/testtheme/32x32/actions/appointment-new.png diff --git a/tests/auto/gui/image/qicon/icons/testtheme/index.theme b/tests/auto/widgets/kernel/qicon/icons/testtheme/index.theme similarity index 100% rename from tests/auto/gui/image/qicon/icons/testtheme/index.theme rename to tests/auto/widgets/kernel/qicon/icons/testtheme/index.theme diff --git a/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg b/tests/auto/widgets/kernel/qicon/icons/testtheme/scalable/actions/svg-only.svg similarity index 100% rename from tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg rename to tests/auto/widgets/kernel/qicon/icons/testtheme/scalable/actions/svg-only.svg diff --git a/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png b/tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/address-book-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png rename to tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/address-book-new.png diff --git a/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png b/tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/appointment-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png rename to tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/appointment-new.png diff --git a/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png b/tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/address-book-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png rename to tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/address-book-new.png diff --git a/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png b/tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/appointment-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png rename to tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/appointment-new.png diff --git a/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png b/tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/address-book-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png rename to tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/address-book-new.png diff --git a/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png b/tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/appointment-new.png similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png rename to tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/appointment-new.png diff --git a/tests/auto/gui/image/qicon/icons/themeparent/index.theme b/tests/auto/widgets/kernel/qicon/icons/themeparent/index.theme similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/index.theme rename to tests/auto/widgets/kernel/qicon/icons/themeparent/index.theme diff --git a/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg b/tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/address-book-new.svg similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg rename to tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/address-book-new.svg diff --git a/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg b/tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/appointment-new.svg similarity index 100% rename from tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg rename to tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/appointment-new.svg diff --git a/tests/auto/gui/image/qicon/image.png b/tests/auto/widgets/kernel/qicon/image.png similarity index 100% rename from tests/auto/gui/image/qicon/image.png rename to tests/auto/widgets/kernel/qicon/image.png diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/widgets/kernel/qicon/qicon.pro similarity index 100% rename from tests/auto/gui/image/qicon/qicon.pro rename to tests/auto/widgets/kernel/qicon/qicon.pro diff --git a/tests/auto/gui/image/qicon/rect.png b/tests/auto/widgets/kernel/qicon/rect.png similarity index 100% rename from tests/auto/gui/image/qicon/rect.png rename to tests/auto/widgets/kernel/qicon/rect.png diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/widgets/kernel/qicon/tst_qicon.cpp similarity index 100% rename from tests/auto/gui/image/qicon/tst_qicon.cpp rename to tests/auto/widgets/kernel/qicon/tst_qicon.cpp diff --git a/tests/auto/gui/image/qicon/tst_qicon.qrc b/tests/auto/widgets/kernel/qicon/tst_qicon.qrc similarity index 100% rename from tests/auto/gui/image/qicon/tst_qicon.qrc rename to tests/auto/widgets/kernel/qicon/tst_qicon.qrc