Fix widget dependencies for multimediawidget tests and examples.

Change-Id: I9c7600ce2cf7980f923ba038ef122b49add24c37
Reviewed-on: http://codereview.qt-project.org/5286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

diff --git a/examples/declarative-radio/main.cpp b/examples/declarative-radio/main.cpp
index 462fd82..8156425 100644 (file)
--- a/examples/declarative-radio/main.cpp
+++ b/examples/declarative-radio/main.cpp
@@ -38,7 +38,7 @@
  **
  ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 
 #include <qdeclarative.h>
 #include <qsgview.h>
@@ -46,7 +46,7 @@
 
 int main(int argc, char ** argv)
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     QSGView view;
 

diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
index 3faeb32..35d7b14 100644 (file)
--- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
@@ -14,3 +14,4 @@ SOURCES += \
         $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase.cpp
 
 INCLUDEPATH += $$QT.multimediakit.sources/../imports/multimedia
+QT+=widgets

diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
index b91b8be..25ebe0f 100644 (file)
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -7,3 +7,4 @@ SOURCES += tst_qgraphicsvideoitem.cpp
 
 # QPA minimal crashes with this test in QBackingStore
 qpa:CONFIG += insignificant_test
+QT+=widgets

diff --git a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro b/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
index e978689..f349368 100644 (file)
--- a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
+++ b/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
@@ -13,3 +13,4 @@ RESOURCES += \
 wince* {
     !contains(QT_CONFIG, no-jpeg): DEPLOYMENT_PLUGIN += qjpeg
 }
+QT+=widgets

diff --git a/tests/auto/qmediaobject/main.cpp b/tests/auto/qmediaobject/main.cpp
index e99d93e..5e82276 100644 (file)
--- a/tests/auto/qmediaobject/main.cpp
+++ b/tests/auto/qmediaobject/main.cpp
@@ -45,7 +45,7 @@
 
 int main(int argc, char**argv)
 {
-    QApplication app(argc,argv);
+    QCoreApplication app(argc,argv);
     int ret;
     tst_QMediaObject test_api;
     ret = QTest::qExec(&test_api, argc, argv);

diff --git a/tests/auto/qmediaplayer/main.cpp b/tests/auto/qmediaplayer/main.cpp
index de90585..417dcd3 100755 (executable)
--- a/tests/auto/qmediaplayer/main.cpp
+++ b/tests/auto/qmediaplayer/main.cpp
@@ -45,7 +45,7 @@
 
 int main(int argc, char**argv)
 {
-    QApplication app(argc,argv);
+    QCoreApplication app(argc,argv);
     int ret;
     tst_QMediaPlayer test_api;
     ret = QTest::qExec(&test_api, argc, argv);

diff --git a/tests/auto/qmediarecorder/main.cpp b/tests/auto/qmediarecorder/main.cpp
index 98484e4..cda3faf 100755 (executable)
--- a/tests/auto/qmediarecorder/main.cpp
+++ b/tests/auto/qmediarecorder/main.cpp
@@ -45,7 +45,7 @@
 
 int main(int argc, char**argv)
 {
-    QApplication app(argc,argv);
+    QCoreApplication app(argc,argv);
     int ret;
     tst_QMediaRecorder test_api;
     ret = QTest::qExec(&test_api, argc, argv);

diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
index 953df2b..8c109b2 100644 (file)
--- a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
@@ -14,3 +14,4 @@ SOURCES += tst_qpaintervideosurface.cpp
 
 # QPA-minimal and OpenGL don't get along
 qpa:CONFIG += insignificant_test
+QT+=widgets

diff --git a/tests/auto/qradiotuner/main.cpp b/tests/auto/qradiotuner/main.cpp
index 8b7f838..b2d6fd2 100755 (executable)
--- a/tests/auto/qradiotuner/main.cpp
+++ b/tests/auto/qradiotuner/main.cpp
@@ -45,7 +45,7 @@
 
 int main(int argc, char**argv)
 {
-    QApplication app(argc,argv);
+    QCoreApplication app(argc,argv);
     int ret;
     tst_QRadioTuner test_api;
     ret = QTest::qExec(&test_api, argc, argv);

diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro
index 50877ca..4a034c1 100644 (file)
--- a/tests/auto/qvideowidget/qvideowidget.pro
+++ b/tests/auto/qvideowidget/qvideowidget.pro
@@ -7,3 +7,4 @@ SOURCES += tst_qvideowidget.cpp
 
 # QPA seems to break some assumptions
 qpa:CONFIG += insignificant_test
+QT+=widgets