QIcon: move back to QtGui
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 14 May 2012 16:02:16 +0000 (18:02 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 18 May 2012 19:42:38 +0000 (21:42 +0200)
commit6c06e14a49773ce5572935864ed6b9be219c6103
tree14bb88db68657527cabe6590b6cf5044aed65307
parent83645377e98fb1312b6f80a1c996a013b62f0b46
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>
50 files changed:
src/gui/image/image.pri
src/gui/image/qicon.cpp [moved from src/widgets/kernel/qicon.cpp with 95% similarity]
src/gui/image/qicon.h [moved from src/widgets/kernel/qicon.h with 92% similarity]
src/gui/image/qicon_p.h [moved from src/widgets/kernel/qicon_p.h with 98% similarity]
src/gui/image/qiconengine.cpp [moved from src/widgets/kernel/qiconengine.cpp with 99% similarity]
src/gui/image/qiconengine.h [moved from src/widgets/kernel/qiconengine.h with 97% similarity]
src/gui/image/qiconengineplugin.cpp [moved from src/widgets/kernel/qiconengineplugin.cpp with 99% similarity]
src/gui/image/qiconengineplugin.h [moved from src/widgets/kernel/qiconengineplugin.h with 93% similarity]
src/gui/image/qiconloader.cpp [moved from src/widgets/kernel/qiconloader.cpp with 97% similarity]
src/gui/image/qiconloader_p.h [moved from src/widgets/kernel/qiconloader_p.h with 98% similarity]
src/gui/kernel/qguiapplication_p.h
src/testlib/qtest_gui.h
src/widgets/dialogs/qfilesystemmodel.h
src/widgets/dialogs/qmessagebox.cpp
src/widgets/itemviews/qfileiconprovider.h
src/widgets/itemviews/qstandarditemmodel.h
src/widgets/kernel/kernel.pri
src/widgets/kernel/qaction.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qapplication_p.h
src/widgets/styles/qstyle.h
src/widgets/styles/qstyleoption.h
src/widgets/util/qsystemtrayicon.h
src/widgets/util/qundoview.cpp
src/widgets/widgets/qabstractbutton.h
src/widgets/widgets/qmenu.h
src/widgets/widgets/qtabwidget.h
src/widgets/widgets/qtoolbox.h
tests/auto/gui/image/image.pro
tests/auto/gui/image/qicon/.gitignore [moved from tests/auto/widgets/kernel/qicon/.gitignore with 100% similarity]
tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/appointment-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/appointment-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/appointment-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/testtheme/index.theme [moved from tests/auto/widgets/kernel/qicon/icons/testtheme/index.theme with 100% similarity]
tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg [moved from tests/auto/widgets/kernel/qicon/icons/testtheme/scalable/actions/svg-only.svg with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/16x16/actions/address-book-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png [moved from tests/auto/widgets/kernel/qicon/icons/testtheme/16x16/actions/appointment-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/22x22/actions/address-book-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png [moved from tests/auto/widgets/kernel/qicon/icons/testtheme/22x22/actions/appointment-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/32x32/actions/address-book-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png [moved from tests/auto/widgets/kernel/qicon/icons/testtheme/32x32/actions/appointment-new.png with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/index.theme [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/index.theme with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/address-book-new.svg with 100% similarity]
tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg [moved from tests/auto/widgets/kernel/qicon/icons/themeparent/scalable/actions/appointment-new.svg with 100% similarity]
tests/auto/gui/image/qicon/image.png [moved from tests/auto/widgets/kernel/qicon/image.png with 100% similarity]
tests/auto/gui/image/qicon/qicon.pro [moved from tests/auto/widgets/kernel/qicon/qicon.pro with 100% similarity]
tests/auto/gui/image/qicon/rect.png [moved from tests/auto/widgets/kernel/qicon/rect.png with 100% similarity]
tests/auto/gui/image/qicon/tst_qicon.cpp [moved from tests/auto/widgets/kernel/qicon/tst_qicon.cpp with 100% similarity]
tests/auto/gui/image/qicon/tst_qicon.qrc [moved from tests/auto/widgets/kernel/qicon/tst_qicon.qrc with 100% similarity]
tests/auto/widgets/kernel/kernel.pro