diff options
| author | ybot <tjtomkins@gmail.com> | 2012-05-20 17:20:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-20 09:41:34 +0200 |
| commit | b032fc3628376dad94703bd180638cff9ff2a653 (patch) | |
| tree | ce057b1c74d1bfd34c781f94be30006e04d17e63 | |
| parent | 99178de8d546b3fcb6db3565c5918b92c2238281 (diff) | |
Move QIcon reference from QtWidgets to QtGui.
Change-Id: I3e0de1442ee22a57dff2d7e2468e3c650c998ffc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | examples/phonon/qmediaplayer/mediaplayer.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/platform.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/seekslider_p.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/volumeslider_p.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/phonon/qmediaplayer/mediaplayer.h b/examples/phonon/qmediaplayer/mediaplayer.h index d58bd2e..4f9ae09 100644 --- a/examples/phonon/qmediaplayer/mediaplayer.h +++ b/examples/phonon/qmediaplayer/mediaplayer.h @@ -42,7 +42,7 @@ #ifndef MEDIALAYER_H #define MEDIAPLAYER_H -#include <QtWidgets/QIcon> +#include <QtGui/QIcon> #include <QtWidgets/QAction> #include <QtWidgets/QWidget> #include <QtWidgets/QApplication> diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp index 1b05b35..c8cfbcb 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp @@ -29,7 +29,7 @@ #include "phononnamespace_p.h" #include <QtCore/QMimeData> #include <QtCore/QStringList> -#include <QtWidgets/QIcon> +#include <QtGui/QIcon> #include "factory_p.h" QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/platform.cpp b/src/3rdparty/phonon/phonon/platform.cpp index 30ea6e4..9cd0b41 100644 --- a/src/3rdparty/phonon/phonon/platform.cpp +++ b/src/3rdparty/phonon/phonon/platform.cpp @@ -25,7 +25,7 @@ #include "factory_p.h" #include <QtCore/QCoreApplication> #include <QtCore/QUrl> -#include <QtWidgets/QIcon> +#include <QtGui/QIcon> #include <QtWidgets/QStyle> #include <QtWidgets/QApplication> diff --git a/src/3rdparty/phonon/phonon/seekslider_p.h b/src/3rdparty/phonon/phonon/seekslider_p.h index 2741150..17a8a4b 100644 --- a/src/3rdparty/phonon/phonon/seekslider_p.h +++ b/src/3rdparty/phonon/phonon/seekslider_p.h @@ -28,7 +28,7 @@ #include <QtWidgets/QBoxLayout> #include <QtWidgets/QLabel> #include <QtGui/QPixmap> -#include <QtWidgets/QIcon> +#include <QtGui/QIcon> #include <QtWidgets/QStyle> #include "factory_p.h" #include <QtCore/QPointer> diff --git a/src/3rdparty/phonon/phonon/volumeslider_p.h b/src/3rdparty/phonon/phonon/volumeslider_p.h index cf73261..2c6b62b 100644 --- a/src/3rdparty/phonon/phonon/volumeslider_p.h +++ b/src/3rdparty/phonon/phonon/volumeslider_p.h @@ -31,7 +31,7 @@ #include <QtWidgets/QToolButton> #include "factory_p.h" #include "audiooutput.h" -#include <QtWidgets/QIcon> +#include <QtGui/QIcon> #include <QtCore/QPointer> #include "platform_p.h" |