diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-05-14 18:02:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 21:42:38 +0200 |
| commit | 6c06e14a49773ce5572935864ed6b9be219c6103 (patch) | |
| tree | 14bb88db68657527cabe6590b6cf5044aed65307 /src/widgets/util/qsystemtrayicon.h | |
| parent | 83645377e98fb1312b6f80a1c996a013b62f0b46 (diff) | |
| download | qtbase-6c06e14a49773ce5572935864ed6b9be219c6103.tar.gz | |
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 'src/widgets/util/qsystemtrayicon.h')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 96f9a1d2f4..b2ca5f0a34 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -46,7 +46,7 @@ #ifndef QT_NO_SYSTEMTRAYICON -#include <QtWidgets/qicon.h> +#include <QtGui/qicon.h> QT_BEGIN_HEADER |