diff options
-rw-r--r-- | src/3rdparty/phonon/gstreamer/videowidget.cpp | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/effectwidget.cpp | 12 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/effectwidget.h | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/platform.cpp | 6 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/seekslider.cpp | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/seekslider.h | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/seekslider_p.h | 8 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/swiftslider.cpp | 4 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/swiftslider_p.h | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/videoplayer.cpp | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/videoplayer.h | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/videowidget.cpp | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/videowidget.h | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/videowidget_p.h | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/volumeslider.h | 2 | ||||
-rw-r--r-- | src/3rdparty/phonon/phonon/volumeslider_p.h | 8 | ||||
-rw-r--r-- | src/phonon/phonon.pro | 2 |
18 files changed, 33 insertions, 31 deletions
diff --git a/src/3rdparty/phonon/gstreamer/videowidget.cpp b/src/3rdparty/phonon/gstreamer/videowidget.cpp index a4c6f79..214c50d 100644 --- a/src/3rdparty/phonon/gstreamer/videowidget.cpp +++ b/src/3rdparty/phonon/gstreamer/videowidget.cpp @@ -21,7 +21,7 @@ #include <QtGui/QPalette> #include <QtGui/QImage> #include <QtGui/QPainter> -#include <QtGui/QBoxLayout> +#include <QtWidgets/QBoxLayout> #include <QApplication> #include <gst/gst.h> #include <gst/interfaces/propertyprobe.h> diff --git a/src/3rdparty/phonon/phonon/effectwidget.cpp b/src/3rdparty/phonon/phonon/effectwidget.cpp index edcbe1f..c2d3ee5 100644 --- a/src/3rdparty/phonon/phonon/effectwidget.cpp +++ b/src/3rdparty/phonon/phonon/effectwidget.cpp @@ -29,12 +29,12 @@ #include "effect.h" #include "effectparameter.h" #include "phonondefs_p.h" -#include <QtGui/QBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QSpinBox> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QSlider> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSlider> #include <limits> #ifdef min diff --git a/src/3rdparty/phonon/phonon/effectwidget.h b/src/3rdparty/phonon/phonon/effectwidget.h index 17a310f..427e644 100644 --- a/src/3rdparty/phonon/phonon/effectwidget.h +++ b/src/3rdparty/phonon/phonon/effectwidget.h @@ -25,7 +25,7 @@ #include "phonon_export.h" #include "phonondefs.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp index 741a74c..c1c9f34 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 <QtGui/QIcon> +#include <QtWidgets/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 49c4561..30ea6e4 100644 --- a/src/3rdparty/phonon/phonon/platform.cpp +++ b/src/3rdparty/phonon/phonon/platform.cpp @@ -25,9 +25,9 @@ #include "factory_p.h" #include <QtCore/QCoreApplication> #include <QtCore/QUrl> -#include <QtGui/QIcon> -#include <QtGui/QStyle> -#include <QtGui/QApplication> +#include <QtWidgets/QIcon> +#include <QtWidgets/QStyle> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/seekslider.cpp b/src/3rdparty/phonon/phonon/seekslider.cpp index b5b25f0..e31d014 100644 --- a/src/3rdparty/phonon/phonon/seekslider.cpp +++ b/src/3rdparty/phonon/phonon/seekslider.cpp @@ -26,7 +26,7 @@ #include "phonondefs_p.h" #include <QtGui/QMouseEvent> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/seekslider.h b/src/3rdparty/phonon/phonon/seekslider.h index 0005029..14ff035 100644 --- a/src/3rdparty/phonon/phonon/seekslider.h +++ b/src/3rdparty/phonon/phonon/seekslider.h @@ -26,7 +26,7 @@ #include "phonon_export.h" #include "phonondefs.h" #include "phononnamespace.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/seekslider_p.h b/src/3rdparty/phonon/phonon/seekslider_p.h index 911ab25..2741150 100644 --- a/src/3rdparty/phonon/phonon/seekslider_p.h +++ b/src/3rdparty/phonon/phonon/seekslider_p.h @@ -25,11 +25,11 @@ #include "seekslider.h" #include "swiftslider_p.h" -#include <QtGui/QBoxLayout> -#include <QtGui/QLabel> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QLabel> #include <QtGui/QPixmap> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QtWidgets/QIcon> +#include <QtWidgets/QStyle> #include "factory_p.h" #include <QtCore/QPointer> #include "platform_p.h" diff --git a/src/3rdparty/phonon/phonon/swiftslider.cpp b/src/3rdparty/phonon/phonon/swiftslider.cpp index 1e274aa..5fa5159 100644 --- a/src/3rdparty/phonon/phonon/swiftslider.cpp +++ b/src/3rdparty/phonon/phonon/swiftslider.cpp @@ -23,8 +23,8 @@ #include "swiftslider_p.h" #include <QtGui/QMouseEvent> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleOption> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/swiftslider_p.h b/src/3rdparty/phonon/phonon/swiftslider_p.h index b063b47..fc7d285 100644 --- a/src/3rdparty/phonon/phonon/swiftslider_p.h +++ b/src/3rdparty/phonon/phonon/swiftslider_p.h @@ -23,7 +23,7 @@ #ifndef SWIFTSLIDER_H #define SWIFTSLIDER_H -#include <QtGui/QSlider> +#include <QtWidgets/QSlider> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videoplayer.cpp b/src/3rdparty/phonon/phonon/videoplayer.cpp index 8851b05..f8cdfa5 100644 --- a/src/3rdparty/phonon/phonon/videoplayer.cpp +++ b/src/3rdparty/phonon/phonon/videoplayer.cpp @@ -25,7 +25,7 @@ #include "audiooutput.h" #include "videowidget.h" #include "path.h" -#include <QtGui/QBoxLayout> +#include <QtWidgets/QBoxLayout> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videoplayer.h b/src/3rdparty/phonon/phonon/videoplayer.h index 7970f04..e058b91 100644 --- a/src/3rdparty/phonon/phonon/videoplayer.h +++ b/src/3rdparty/phonon/phonon/videoplayer.h @@ -26,7 +26,7 @@ #include "phonon_export.h" #include "phononnamespace.h" #include "mediasource.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videowidget.cpp b/src/3rdparty/phonon/phonon/videowidget.cpp index 4575dfd..3b40a13 100644 --- a/src/3rdparty/phonon/phonon/videowidget.cpp +++ b/src/3rdparty/phonon/phonon/videowidget.cpp @@ -27,7 +27,7 @@ #include "phonondefs_p.h" #include "phononnamespace_p.h" -#include <QtGui/QAction> +#include <QtWidgets/QAction> #define IFACES4 VideoWidgetInterface44 #define IFACES0 VideoWidgetInterface, IFACES4 #define PHONON_INTERFACENAME IFACES0 diff --git a/src/3rdparty/phonon/phonon/videowidget.h b/src/3rdparty/phonon/phonon/videowidget.h index 804e61a..cc848a0 100644 --- a/src/3rdparty/phonon/phonon/videowidget.h +++ b/src/3rdparty/phonon/phonon/videowidget.h @@ -25,7 +25,7 @@ #include "phonon_export.h" #include "phonondefs.h" #include "abstractvideooutput.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videowidget_p.h b/src/3rdparty/phonon/phonon/videowidget_p.h index 3335135..e0691f7 100644 --- a/src/3rdparty/phonon/phonon/videowidget_p.h +++ b/src/3rdparty/phonon/phonon/videowidget_p.h @@ -25,7 +25,7 @@ #include "videowidget.h" #include "abstractvideooutput_p.h" -#include <QtGui/QBoxLayout> +#include <QtWidgets/QBoxLayout> #include <QtCore/QEvent> #include <QtCore/QCoreApplication> #include <QtGui/QPalette> diff --git a/src/3rdparty/phonon/phonon/volumeslider.h b/src/3rdparty/phonon/phonon/volumeslider.h index f5ef34f..453a6e5 100644 --- a/src/3rdparty/phonon/phonon/volumeslider.h +++ b/src/3rdparty/phonon/phonon/volumeslider.h @@ -25,7 +25,7 @@ #include "phonon_export.h" #include "phonondefs.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/volumeslider_p.h b/src/3rdparty/phonon/phonon/volumeslider_p.h index 623275f..cf73261 100644 --- a/src/3rdparty/phonon/phonon/volumeslider_p.h +++ b/src/3rdparty/phonon/phonon/volumeslider_p.h @@ -25,13 +25,13 @@ #include "volumeslider.h" #include "swiftslider_p.h" -#include <QtGui/QBoxLayout> -#include <QtGui/QLabel> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QLabel> #include <QtGui/QPixmap> -#include <QtGui/QToolButton> +#include <QtWidgets/QToolButton> #include "factory_p.h" #include "audiooutput.h" -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QPointer> #include "platform_p.h" diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro index db7605f..6805f81 100644 --- a/src/phonon/phonon.pro +++ b/src/phonon/phonon.pro @@ -4,6 +4,8 @@ TARGET = phonon QPRO_PWD = $$PWD load(qt_module_config) +QT += widgets + PHONON_MAJOR_VERSION = $${QT_MAJOR_VERSION} PHONON_MINOR_VERSION = 4 PHONON_PATCH_VERSION = 0 |