summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-05-14 18:02:16 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-18 21:42:38 +0200
commit6c06e14a49773ce5572935864ed6b9be219c6103 (patch)
tree14bb88db68657527cabe6590b6cf5044aed65307 /tests
parent83645377e98fb1312b6f80a1c996a013b62f0b46 (diff)
QIcon: move back to QtGui
- Move the files and tests git mv src/widgets/kernel/qicon* qrc/gui/image/ git mv tests/auto/widgets/kernel/qicon/ tests/auto/gui/image/ - update the include of QIcon git grep -O"sed -i s,QtWidgets/qicon,QtGui/qicon," "QtWidgets/qicon" git grep -O"sed -i s,QtWidgets/QIcon,QtGui/QIcon," "QtWidgets/QIcon" - Adapt QIcon \ingroup documentation sed -i s/QtWidgets/QtGui/ src/gui/images/qicon* - Adapt export macro sed -i s/Q_WIDGETS_EXPORT/Q_GUI_EXPORT/g src/gui/image/qicon* - Update .pri and .pro files - Remove the use of QStyle::alignedRect by copying its content (and adapt slightly - Use QGuiApplication::palette() instead of QApplication::palette() - Add a hook in QGuiApplicationPrivate to call the QStyle::generatedIconPixmap() from QtWidgets Another commit follows to adjust QMetaType::Icon and move the QVariant and QMetaType icon handler back in QtGui Change-Id: I1b63759f892ebc02dfc30f41bb6e76e0b7451182 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/image/image.pro1
-rw-r--r--tests/auto/gui/image/qicon/.gitignore (renamed from tests/auto/widgets/kernel/qicon/.gitignore)0
-rw-r--r--tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/testtheme/16x16/actions/appointment-new.png)bin897 -> 897 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/testtheme/22x22/actions/appointment-new.png)bin1411 -> 1411 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/testtheme/32x32/actions/appointment-new.png)bin2399 -> 2399 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/testtheme/index.theme (renamed from tests/auto/widgets/kernel/qicon/icons/testtheme/index.theme)0
-rw-r--r--tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg (renamed from tests/auto/widgets/kernel/qicon/icons/testtheme/scalable/actions/svg-only.svg)0
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/address-book-new.png)bin796 -> 796 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/appointment-new.png)bin897 -> 897 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/address-book-new.png)bin924 -> 924 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/appointment-new.png)bin1411 -> 1411 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/address-book-new.png)bin1897 -> 1897 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/appointment-new.png)bin2399 -> 2399 bytes
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/index.theme (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/index.theme)0
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/address-book-new.svg)0
-rw-r--r--tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg (renamed from tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/appointment-new.svg)0
-rw-r--r--tests/auto/gui/image/qicon/image.png (renamed from tests/auto/widgets/kernel/qicon/image.png)bin14743 -> 14743 bytes
-rw-r--r--tests/auto/gui/image/qicon/qicon.pro (renamed from tests/auto/widgets/kernel/qicon/qicon.pro)0
-rw-r--r--tests/auto/gui/image/qicon/rect.png (renamed from tests/auto/widgets/kernel/qicon/rect.png)bin175 -> 175 bytes
-rw-r--r--tests/auto/gui/image/qicon/tst_qicon.cpp (renamed from tests/auto/widgets/kernel/qicon/tst_qicon.cpp)0
-rw-r--r--tests/auto/gui/image/qicon/tst_qicon.qrc (renamed from tests/auto/widgets/kernel/qicon/tst_qicon.qrc)0
-rw-r--r--tests/auto/widgets/kernel/kernel.pro1
22 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro
index 5a03063f47..1ef52df4ba 100644
--- a/tests/auto/gui/image/image.pro
+++ b/tests/auto/gui/image/image.pro
@@ -9,6 +9,7 @@ SUBDIRS=\
qimagewriter \
qmovie \
qpicture \
+ qicon \
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
qpixmapcache \
diff --git a/tests/auto/widgets/kernel/qicon/.gitignore b/tests/auto/gui/image/qicon/.gitignore
index c101ef9d28..c101ef9d28 100644
--- a/tests/auto/widgets/kernel/qicon/.gitignore
+++ b/tests/auto/gui/image/qicon/.gitignore
diff --git a/tests/auto/widgets/kernel/qicon/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png
index 18b7c6781e..18b7c6781e 100644
--- a/tests/auto/widgets/kernel/qicon/icons/testtheme/16x16/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png
index d676ffd463..d676ffd463 100644
--- a/tests/auto/widgets/kernel/qicon/icons/testtheme/22x22/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/testtheme/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png
index 85daef3b0b..85daef3b0b 100644
--- a/tests/auto/widgets/kernel/qicon/icons/testtheme/32x32/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/testtheme/index.theme b/tests/auto/gui/image/qicon/icons/testtheme/index.theme
index e18736ab43..e18736ab43 100644
--- a/tests/auto/widgets/kernel/qicon/icons/testtheme/index.theme
+++ b/tests/auto/gui/image/qicon/icons/testtheme/index.theme
diff --git a/tests/auto/widgets/kernel/qicon/icons/testtheme/scalable/actions/svg-only.svg b/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg
index 4cb14f82f0..4cb14f82f0 100644
--- a/tests/auto/widgets/kernel/qicon/icons/testtheme/scalable/actions/svg-only.svg
+++ b/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png
index 2098cfdf36..2098cfdf36 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/address-book-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png
index 18b7c6781e..18b7c6781e 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png
index fad446cd92..fad446cd92 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/address-book-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png
index d676ffd463..d676ffd463 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png
index 420139d307..420139d307 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/address-book-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png
index 85daef3b0b..85daef3b0b 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/index.theme b/tests/auto/gui/image/qicon/icons/themeparent/index.theme
index e536a0bf2f..e536a0bf2f 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/index.theme
+++ b/tests/auto/gui/image/qicon/icons/themeparent/index.theme
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/address-book-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg
index 600a82c1b0..600a82c1b0 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/address-book-new.svg
+++ b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg
diff --git a/tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/appointment-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg
index 4cb14f82f0..4cb14f82f0 100644
--- a/tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/appointment-new.svg
+++ b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg
diff --git a/tests/auto/widgets/kernel/qicon/image.png b/tests/auto/gui/image/qicon/image.png
index 8d703640c1..8d703640c1 100644
--- a/tests/auto/widgets/kernel/qicon/image.png
+++ b/tests/auto/gui/image/qicon/image.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro
index c44c080ced..c44c080ced 100644
--- a/tests/auto/widgets/kernel/qicon/qicon.pro
+++ b/tests/auto/gui/image/qicon/qicon.pro
diff --git a/tests/auto/widgets/kernel/qicon/rect.png b/tests/auto/gui/image/qicon/rect.png
index b5d3ecbddf..b5d3ecbddf 100644
--- a/tests/auto/widgets/kernel/qicon/rect.png
+++ b/tests/auto/gui/image/qicon/rect.png
Binary files differ
diff --git a/tests/auto/widgets/kernel/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index cca0887a21..cca0887a21 100644
--- a/tests/auto/widgets/kernel/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
diff --git a/tests/auto/widgets/kernel/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc
index 7925a33c84..7925a33c84 100644
--- a/tests/auto/widgets/kernel/qicon/tst_qicon.qrc
+++ b/tests/auto/gui/image/qicon/tst_qicon.qrc
diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro
index e1c245d9d1..c2540ec229 100644
--- a/tests/auto/widgets/kernel/kernel.pro
+++ b/tests/auto/widgets/kernel/kernel.pro
@@ -13,7 +13,6 @@ SUBDIRS=\
qwidget \
qwidget_window \
qwidgetaction \
- qicon \
qshortcut \
SUBDIRS -= qsound