diff options
Diffstat (limited to 'examples')
54 files changed, 329 insertions, 47 deletions
diff --git a/examples/audiodevices/audiodevices.pro b/examples/audiodevices/audiodevices.pro index 3b77ec21b..87391db1f 100644 --- a/examples/audiodevices/audiodevices.pro +++ b/examples/audiodevices/audiodevices.pro @@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices INSTALLS += target sources +QT+=widgets diff --git a/examples/audiodevices/main.cpp b/examples/audiodevices/main.cpp index 691afb966..e64f2c50c 100644 --- a/examples/audiodevices/main.cpp +++ b/examples/audiodevices/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "audiodevices.h" diff --git a/examples/audioinput/audioinput.pro b/examples/audioinput/audioinput.pro index 6d2aa501d..cd6306673 100644 --- a/examples/audioinput/audioinput.pro +++ b/examples/audioinput/audioinput.pro @@ -14,3 +14,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput INSTALLS += target sources +QT+=widgets diff --git a/examples/audioinput/main.cpp b/examples/audioinput/main.cpp index 9a9eb7042..a02c01ea9 100644 --- a/examples/audioinput/main.cpp +++ b/examples/audioinput/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "audioinput.h" diff --git a/examples/audiooutput/audiooutput.pro b/examples/audiooutput/audiooutput.pro index 38159fa70..b289cdbfc 100644 --- a/examples/audiooutput/audiooutput.pro +++ b/examples/audiooutput/audiooutput.pro @@ -14,3 +14,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput INSTALLS += target sources +QT+=widgets diff --git a/examples/audiooutput/main.cpp b/examples/audiooutput/main.cpp index f411aeba1..0c187154e 100644 --- a/examples/audiooutput/main.cpp +++ b/examples/audiooutput/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "audiooutput.h" diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/audiorecorder/audiorecorder.cpp index ae6d3956e..38f08ac4b 100644 --- a/examples/audiorecorder/audiorecorder.cpp +++ b/examples/audiorecorder/audiorecorder.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <QtCore/qdir.h> -#include <QtGui/qfiledialog.h> +#include <QtWidgets/qfiledialog.h> #include <qaudiocapturesource.h> #include <qmediarecorder.h> diff --git a/examples/audiorecorder/audiorecorder.h b/examples/audiorecorder/audiorecorder.h index 5e079ee23..51a777ccd 100644 --- a/examples/audiorecorder/audiorecorder.h +++ b/examples/audiorecorder/audiorecorder.h @@ -42,7 +42,7 @@ #define AUDIORECORDER_H #include <QtCore/qurl.h> -#include <QtGui/qmainwindow.h> +#include <QtWidgets/qmainwindow.h> #include <qmediarecorder.h> diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro index 5ab3ec951..b5b5d1055 100644 --- a/examples/audiorecorder/audiorecorder.pro +++ b/examples/audiorecorder/audiorecorder.pro @@ -22,3 +22,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder INSTALLS += target sources +QT+=widgets diff --git a/examples/audiorecorder/main.cpp b/examples/audiorecorder/main.cpp index 80223a42d..12c564800 100644 --- a/examples/audiorecorder/main.cpp +++ b/examples/audiorecorder/main.cpp @@ -40,7 +40,7 @@ #include "audiorecorder.h" -#include <QtGui> +#include <QtWidgets> int main(int argc, char *argv[]) { diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp index f9f37ce3d..b8bb675be 100644 --- a/examples/camera/camera.cpp +++ b/examples/camera/camera.cpp @@ -51,7 +51,7 @@ #include <qmessagebox.h> #include <qpalette.h> -#include <QtGui> +#include <QtWidgets> #if (defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700 #define HAVE_CAMERA_BUTTONS diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro index caa58cb77..a519354ed 100644 --- a/examples/camera/camera.pro +++ b/examples/camera/camera.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = camera -QT += multimediakit +QT += multimediakit multimediakitwidgets HEADERS = \ camera.h \ @@ -25,3 +25,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera INSTALLS += target sources +QT+=widgets diff --git a/examples/camera/imagesettings.cpp b/examples/camera/imagesettings.cpp index c1bb2bec6..c3b9b22c2 100644 --- a/examples/camera/imagesettings.cpp +++ b/examples/camera/imagesettings.cpp @@ -41,7 +41,7 @@ #include "imagesettings.h" #include "ui_imagesettings.h" -#include <QtGui/qcombobox.h> +#include <QtWidgets/qcombobox.h> #include <QtCore/qdebug.h> #include <qcameraimagecapture.h> #include <qmediaservice.h> diff --git a/examples/camera/imagesettings.h b/examples/camera/imagesettings.h index 6a245fc26..74bca37d1 100644 --- a/examples/camera/imagesettings.h +++ b/examples/camera/imagesettings.h @@ -41,7 +41,7 @@ #ifndef IMAGESETTINGS_H #define IMAGESETTINGS_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <qmediaencodersettings.h> QT_BEGIN_NAMESPACE diff --git a/examples/camera/main.cpp b/examples/camera/main.cpp index 4fc98ec8d..af2fa4c86 100644 --- a/examples/camera/main.cpp +++ b/examples/camera/main.cpp @@ -40,7 +40,7 @@ #include "camera.h" -#include <QtGui> +#include <QtWidgets> int main(int argc, char *argv[]) { diff --git a/examples/camera/videosettings.cpp b/examples/camera/videosettings.cpp index f9ab33362..c1d816012 100644 --- a/examples/camera/videosettings.cpp +++ b/examples/camera/videosettings.cpp @@ -41,7 +41,7 @@ #include "videosettings.h" #include "ui_videosettings.h" -#include <QtGui/qcombobox.h> +#include <QtWidgets/qcombobox.h> #include <QtCore/qdebug.h> #include <qmediarecorder.h> #include <qmediaservice.h> diff --git a/examples/camera/videosettings.h b/examples/camera/videosettings.h index b84dc8ed2..6cce31d0b 100644 --- a/examples/camera/videosettings.h +++ b/examples/camera/videosettings.h @@ -41,7 +41,7 @@ #ifndef VIDEOSETTINGS_H #define VIDEOSETTINGS_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <qmediaencodersettings.h> QT_BEGIN_NAMESPACE diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro index 455ea6298..ad544e9f4 100644 --- a/examples/declarative-camera/declarative-camera.pro +++ b/examples/declarative-camera/declarative-camera.pro @@ -19,3 +19,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera INSTALLS += target sources +QT+=widgets diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp index e137fe9c2..697f797ce 100644 --- a/examples/declarative-camera/qmlcamera.cpp +++ b/examples/declarative-camera/qmlcamera.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> +#include <QtWidgets/QApplication> +#include <QtWidgets/QDesktopWidget> #include <QtQuick1/qdeclarativeview.h> #include <QtDeclarative/QDeclarativeEngine> diff --git a/examples/declarative-radio/declarative-radio.pro b/examples/declarative-radio/declarative-radio.pro new file mode 100644 index 000000000..f3dab6411 --- /dev/null +++ b/examples/declarative-radio/declarative-radio.pro @@ -0,0 +1,10 @@ +TEMPLATE = app +TARGET = declarative-radio +DEPENDPATH += . +INCLUDEPATH += . +QT += declarative multimediakit + +# Input +SOURCES += main.cpp +RESOURCES += declarative-radio.qrc + diff --git a/examples/declarative-radio/declarative-radio.qrc b/examples/declarative-radio/declarative-radio.qrc new file mode 100644 index 000000000..ed01a64f6 --- /dev/null +++ b/examples/declarative-radio/declarative-radio.qrc @@ -0,0 +1,6 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> +<file>view.qml</file> +</qresource> +</RCC> + diff --git a/examples/declarative-radio/main.cpp b/examples/declarative-radio/main.cpp new file mode 100644 index 000000000..815642509 --- /dev/null +++ b/examples/declarative-radio/main.cpp @@ -0,0 +1,58 @@ +/**************************************************************************** + ** + ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + ** All rights reserved. + ** Contact: Nokia Corporation (qt-info@nokia.com) + ** + ** This file is part of the demonstration applications of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:BSD$ + ** You may use this file under the terms of the BSD license as follows: + ** + ** "Redistribution and use in source and binary forms, with or without + ** modification, are permitted provided that the following conditions are + ** met: + ** * Redistributions of source code must retain the above copyright + ** notice, this list of conditions and the following disclaimer. + ** * Redistributions in binary form must reproduce the above copyright + ** notice, this list of conditions and the following disclaimer in + ** the documentation and/or other materials provided with the + ** distribution. + ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + ** the names of its contributors may be used to endorse or promote + ** products derived from this software without specific prior written + ** permission. + ** + ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +#include <QGuiApplication> + +#include <qdeclarative.h> +#include <qsgview.h> + + +int main(int argc, char ** argv) +{ + QGuiApplication app(argc, argv); + + QSGView view; + + view.setSource(QUrl("qrc:view.qml")); + view.show(); + + return app.exec(); +} + diff --git a/examples/declarative-radio/view.qml b/examples/declarative-radio/view.qml new file mode 100644 index 000000000..4e2882d45 --- /dev/null +++ b/examples/declarative-radio/view.qml @@ -0,0 +1,191 @@ +/**************************************************************************** + ** + ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + ** All rights reserved. + ** Contact: Nokia Corporation (qt-info@nokia.com) + ** + ** This file is part of the examples of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:BSD$ + ** You may use this file under the terms of the BSD license as follows: + ** + ** "Redistribution and use in source and binary forms, with or without + ** modification, are permitted provided that the following conditions are + ** met: + ** * Redistributions of source code must retain the above copyright + ** notice, this list of conditions and the following disclaimer. + ** * Redistributions in binary form must reproduce the above copyright + ** notice, this list of conditions and the following disclaimer in + ** the documentation and/or other materials provided with the + ** distribution. + ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + ** the names of its contributors may be used to endorse or promote + ** products derived from this software without specific prior written + ** permission. + ** + ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +import QtQuick 2.0 +import Qt.multimediakit 4.0 + +Rectangle { + width: 400; height: 300; + + Radio { + id: radio + band: Radio.FM + } + + Column { + anchors.fill: parent + anchors.margins: 5 + spacing: 5 + + Row { + + Text { + id: freq + + width: 150 + height: 200 + + verticalAlignment: Text.AlignVCenter + text: "" + radio.frequency / 1000 + " kHz" + } + Text { + id: sig + + width: 200 + height: 200 + + verticalAlignment: Text.AlignVCenter + text: (radio.isAvailable() ? "No Signal " : "No Radio Found") + } + } + + Row { + spacing: 5 + + Rectangle { + width: 350 + height: 10 + + color: "black" + + Rectangle { + width: 5 + height: 10 + color: "red" + + y: 0 + x: (parent.width - 5) * ((radio.frequency - radio.minimumFrequency) / (radio.maximumFrequency - + radio.minimumFrequency)) + + } + } + } + + + Row { + spacing: 5 + + Rectangle { + id: scanDownButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Scan Down" + } + + MouseArea { + anchors.fill: parent + onClicked: radio.scanDown(); + } + } + Rectangle { + id: freqDownButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Freq Down" + } + + MouseArea { + anchors.fill: parent + onClicked: radio.tuneDown(); + } + } + Rectangle { + id: freqUpButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Freq Up" + } + + MouseArea { + anchors.fill: parent + onClicked: radio.tuneUp(); + } + } + Rectangle { + id: scanUpButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Scan Up" + } + + MouseArea { + anchors.fill: parent + onClicked: radio.scanUp(); + } + } + } + } +} diff --git a/examples/examples.pro b/examples/examples.pro index 2a1a2338e..e26fab068 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -15,5 +15,7 @@ SUBDIRS += \ contains(QT_CONFIG, declarative) { disabled:SUBDIRS += declarative-camera + SUBDIRS += declarative-radio } +QT+=widgets diff --git a/examples/player/main.cpp b/examples/player/main.cpp index 42326a764..b995658ba 100644 --- a/examples/player/main.cpp +++ b/examples/player/main.cpp @@ -40,7 +40,7 @@ #include "player.h" -#include <QtGui> +#include <QtWidgets> int main(int argc, char *argv[]) { diff --git a/examples/player/player.cpp b/examples/player/player.cpp index 29612859a..18c9885aa 100644 --- a/examples/player/player.cpp +++ b/examples/player/player.cpp @@ -46,7 +46,7 @@ #include <qmediaservice.h> #include <qmediaplaylist.h> -#include <QtGui> +#include <QtWidgets> Player::Player(QWidget *parent) diff --git a/examples/player/player.h b/examples/player/player.h index ff579451b..eddf5f6b3 100644 --- a/examples/player/player.h +++ b/examples/player/player.h @@ -41,7 +41,7 @@ #ifndef PLAYER_H #define PLAYER_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <qmediaplayer.h> #include <qmediaplaylist.h> diff --git a/examples/player/player.pro b/examples/player/player.pro index 687779f0f..58b6f8ed7 100644 --- a/examples/player/player.pro +++ b/examples/player/player.pro @@ -6,6 +6,7 @@ CONFIG += qt warn_on QT += network \ xml \ multimediakit \ + multimediakitwidgets HEADERS = \ player.h \ @@ -28,3 +29,4 @@ sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player INSTALLS += target sources +QT+=widgets diff --git a/examples/player/playercontrols.cpp b/examples/player/playercontrols.cpp index 86272a52f..d6239fda1 100644 --- a/examples/player/playercontrols.cpp +++ b/examples/player/playercontrols.cpp @@ -40,11 +40,11 @@ #include "playercontrols.h" -#include <QtGui/qboxlayout.h> -#include <QtGui/qslider.h> -#include <QtGui/qstyle.h> -#include <QtGui/qtoolbutton.h> -#include <QtGui/qcombobox.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qslider.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qtoolbutton.h> +#include <QtWidgets/qcombobox.h> PlayerControls::PlayerControls(QWidget *parent) : QWidget(parent) diff --git a/examples/player/playercontrols.h b/examples/player/playercontrols.h index 26efb787a..dbcb2631b 100644 --- a/examples/player/playercontrols.h +++ b/examples/player/playercontrols.h @@ -43,7 +43,7 @@ #include <qmediaplayer.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE class QAbstractButton; diff --git a/examples/player/videowidget.cpp b/examples/player/videowidget.cpp index 5925aceec..b9809671d 100644 --- a/examples/player/videowidget.cpp +++ b/examples/player/videowidget.cpp @@ -40,7 +40,7 @@ #include "videowidget.h" -#include <QtGui> +#include <QtWidgets> VideoWidget::VideoWidget(QWidget *parent) : QVideoWidget(parent) diff --git a/examples/radio/main.cpp b/examples/radio/main.cpp index 1695d719e..56947b16b 100644 --- a/examples/radio/main.cpp +++ b/examples/radio/main.cpp @@ -40,7 +40,7 @@ #include "radio.h" -#include <QtGui> +#include <QtWidgets> int main(int argc, char *argv[]) { diff --git a/examples/radio/radio.cpp b/examples/radio/radio.cpp index 0d4c33e93..f5e6591f3 100644 --- a/examples/radio/radio.cpp +++ b/examples/radio/radio.cpp @@ -40,13 +40,11 @@ #include "radio.h" -#include <QtGui> +#include <QtWidgets> Radio::Radio() { radio = new QRadioTuner; - connect(radio,SIGNAL(frequencyChanged(int)),this,SLOT(freqChanged(int))); - connect(radio,SIGNAL(signalStrengthChanged(int)),this,SLOT(signalChanged(int))); connect(radio, SIGNAL(error(QRadioTuner::Error)), this, SLOT(error(QRadioTuner::Error))); if(radio->isBandSupported(QRadioTuner::FM)) @@ -62,6 +60,7 @@ Radio::Radio() freq = new QLabel; freq->setText(QString("%1 kHz").arg(radio->frequency()/1000)); topBar->addWidget(freq); + connect(radio,SIGNAL(frequencyChanged(int)),this,SLOT(freqChanged(int))); signal = new QLabel; if (radio->isAvailable()) @@ -69,6 +68,8 @@ Radio::Radio() else signal->setText(tr("No radio found")); topBar->addWidget(signal); + connect(radio,SIGNAL(signalStrengthChanged(int)),this,SLOT(signalChanged(int))); + volumeSlider = new QSlider(Qt::Vertical,this); volumeSlider->setRange(0,100); volumeSlider->setValue(50); diff --git a/examples/radio/radio.h b/examples/radio/radio.h index c8e2ac3a3..bd30b3b97 100644 --- a/examples/radio/radio.h +++ b/examples/radio/radio.h @@ -41,7 +41,7 @@ #ifndef RADIO_H #define RADIO_H -#include <QtGui> +#include <QtWidgets> #include <qradiotuner.h> diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro index db4bb0d4d..de55c591b 100644 --- a/examples/radio/radio.pro +++ b/examples/radio/radio.pro @@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio INSTALLS += target sources +QT+=widgets diff --git a/examples/slideshow/main.cpp b/examples/slideshow/main.cpp index 23aca43bd..ffa493f17 100644 --- a/examples/slideshow/main.cpp +++ b/examples/slideshow/main.cpp @@ -40,7 +40,7 @@ #include "slideshow.h" -#include <QtGui> +#include <QtWidgets> int main(int argc, char *argv[]) { diff --git a/examples/slideshow/slideshow.cpp b/examples/slideshow/slideshow.cpp index 14d17ea6b..fea2ee64a 100644 --- a/examples/slideshow/slideshow.cpp +++ b/examples/slideshow/slideshow.cpp @@ -44,7 +44,7 @@ #include <qmediaplaylist.h> #include <qvideowidget.h> -#include <QtGui> +#include <QtWidgets> SlideShow::SlideShow(QWidget *parent) : QMainWindow(parent) diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro index 017addd7a..c4cb38080 100644 --- a/examples/slideshow/slideshow.pro +++ b/examples/slideshow/slideshow.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = slideshow -QT += multimediakit +QT += multimediakit multimediakitwidgets HEADERS = \ slideshow.h @@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow INSTALLS += target sources +QT+=widgets diff --git a/examples/spectrum/app/app.pro b/examples/spectrum/app/app.pro index 120ea43c1..28cc16ab0 100644 --- a/examples/spectrum/app/app.pro +++ b/examples/spectrum/app/app.pro @@ -90,3 +90,4 @@ macx { } +QT+=widgets diff --git a/examples/spectrum/app/main.cpp b/examples/spectrum/app/main.cpp index ca4f078db..af567a000 100644 --- a/examples/spectrum/app/main.cpp +++ b/examples/spectrum/app/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "mainwidget.h" int main(int argc, char **argv) diff --git a/examples/spectrum/spectrum.pro b/examples/spectrum/spectrum.pro index 43e04664b..989ad11d9 100644 --- a/examples/spectrum/spectrum.pro +++ b/examples/spectrum/spectrum.pro @@ -17,3 +17,4 @@ sources.files = README.txt spectrum.pri spectrum.pro TODO.txt sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum INSTALLS += sources +QT+=widgets diff --git a/examples/videographicsitem/main.cpp b/examples/videographicsitem/main.cpp index bf3f331aa..78721dab3 100644 --- a/examples/videographicsitem/main.cpp +++ b/examples/videographicsitem/main.cpp @@ -40,7 +40,7 @@ #include "videoplayer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> int main(int argc, char **argv) { diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro index 4924ab551..54002cf50 100644 --- a/examples/videographicsitem/videographicsitem.pro +++ b/examples/videographicsitem/videographicsitem.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = videographicsitem -QT += multimediakit +QT += multimediakit multimediakitwidgets contains(QT_CONFIG, opengl): QT += opengl @@ -18,3 +18,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem INSTALLS += target sources +QT+=widgets diff --git a/examples/videographicsitem/videoitem.cpp b/examples/videographicsitem/videoitem.cpp index e82fe9dd7..d314ac052 100644 --- a/examples/videographicsitem/videoitem.cpp +++ b/examples/videographicsitem/videoitem.cpp @@ -40,7 +40,7 @@ #include "videoitem.h" -#include <QtGui> +#include <QtWidgets> #include <qvideosurfaceformat.h> VideoItem::VideoItem(QGraphicsItem *parent) diff --git a/examples/videographicsitem/videoitem.h b/examples/videographicsitem/videoitem.h index 53342804a..48215a178 100644 --- a/examples/videographicsitem/videoitem.h +++ b/examples/videographicsitem/videoitem.h @@ -42,7 +42,7 @@ #define VIDEOITEM_H #include <qabstractvideosurface.h> -#include <QtGui/QGraphicsItem> +#include <QtWidgets/QGraphicsItem> class VideoItem : public QAbstractVideoSurface, diff --git a/examples/videographicsitem/videoplayer.cpp b/examples/videographicsitem/videoplayer.cpp index dcda7cbb7..b406d51f5 100644 --- a/examples/videographicsitem/videoplayer.cpp +++ b/examples/videographicsitem/videoplayer.cpp @@ -41,7 +41,7 @@ #include "videoplayer.h" #include "videoitem.h" -#include <QtGui> +#include <QtWidgets> #include <qvideosurfaceformat.h> #if !defined(QT_NO_OPENGL) diff --git a/examples/videographicsitem/videoplayer.h b/examples/videographicsitem/videoplayer.h index 5ca3eb0b3..e08a9dd2f 100644 --- a/examples/videographicsitem/videoplayer.h +++ b/examples/videographicsitem/videoplayer.h @@ -44,7 +44,7 @@ #include <qmediaplayer.h> #include <QtGui/QMovie> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE class QAbstractButton; diff --git a/examples/videowidget/main.cpp b/examples/videowidget/main.cpp index b6fac52a1..725e637c5 100644 --- a/examples/videowidget/main.cpp +++ b/examples/videowidget/main.cpp @@ -40,7 +40,7 @@ #include "videoplayer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> int main(int argc, char *argv[]) { diff --git a/examples/videowidget/videoplayer.cpp b/examples/videowidget/videoplayer.cpp index 3f0c3f4bd..589d0c9b9 100644 --- a/examples/videowidget/videoplayer.cpp +++ b/examples/videowidget/videoplayer.cpp @@ -42,7 +42,7 @@ #include "videowidget.h" -#include <QtGui> +#include <QtWidgets> #include <qvideosurfaceformat.h> VideoPlayer::VideoPlayer(QWidget *parent) diff --git a/examples/videowidget/videoplayer.h b/examples/videowidget/videoplayer.h index 5dd0e1101..573baa152 100644 --- a/examples/videowidget/videoplayer.h +++ b/examples/videowidget/videoplayer.h @@ -44,7 +44,7 @@ #include <qmediaplayer.h> #include <QtGui/QMovie> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE class QAbstractButton; diff --git a/examples/videowidget/videowidget.cpp b/examples/videowidget/videowidget.cpp index 8dbc1f07f..3b4fdfbb1 100644 --- a/examples/videowidget/videowidget.cpp +++ b/examples/videowidget/videowidget.cpp @@ -42,7 +42,7 @@ #include "videowidgetsurface.h" -#include <QtGui> +#include <QtWidgets> #include <qvideosurfaceformat.h> //! [0] diff --git a/examples/videowidget/videowidget.h b/examples/videowidget/videowidget.h index 917e0063d..87987cba7 100644 --- a/examples/videowidget/videowidget.h +++ b/examples/videowidget/videowidget.h @@ -43,7 +43,7 @@ #include "videowidgetsurface.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE class QAbstractVideoSurface; diff --git a/examples/videowidget/videowidget.pro b/examples/videowidget/videowidget.pro index 40f2cc17a..4e442563b 100644 --- a/examples/videowidget/videowidget.pro +++ b/examples/videowidget/videowidget.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = videowidget -QT += multimediakit +QT += multimediakit multimediakitwidgets HEADERS = \ videoplayer.h \ @@ -20,3 +20,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget INSTALLS += target sources +QT+=widgets diff --git a/examples/videowidget/videowidgetsurface.cpp b/examples/videowidget/videowidgetsurface.cpp index 4a18c95a2..a0b71bf35 100644 --- a/examples/videowidget/videowidgetsurface.cpp +++ b/examples/videowidget/videowidgetsurface.cpp @@ -40,7 +40,7 @@ #include "videowidgetsurface.h" -#include <QtGui> +#include <QtWidgets> #include <qabstractvideosurface.h> #include <qvideosurfaceformat.h> |