slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix widget dependencies for multimediawidget tests and examples.

Browse Source 
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>
This commit is contained in:
Gunnar Sletta
2011-09-21 09:11:43 +02:00
committed by Qt by Nokia
parent db79e08675
commit 4806115e61
10 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/declarative-radio/main.cpp
View File

@@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QApplication> #include <QGuiApplication>
#include <qdeclarative.h> #include <qdeclarative.h>
#include <qsgview.h> #include <qsgview.h>
@@ -46,7 +46,7 @@
int main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
QApplication app(argc, argv); QGuiApplication app(argc, argv);
QSGView view; QSGView view;

1
tests/auto/qdeclarativevideo/qdeclarativevideo.pro
View File

@@ -14,3 +14,4 @@ SOURCES += \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase.cpp $$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase.cpp
INCLUDEPATH += $$QT.multimediakit.sources/../imports/multimedia INCLUDEPATH += $$QT.multimediakit.sources/../imports/multimedia
QT+=widgets

1
tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
View File

@@ -7,3 +7,4 @@ SOURCES += tst_qgraphicsvideoitem.cpp
# QPA minimal crashes with this test in QBackingStore # QPA minimal crashes with this test in QBackingStore
qpa:CONFIG += insignificant_test qpa:CONFIG += insignificant_test
QT+=widgets

1
tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
View File

@@ -13,3 +13,4 @@ RESOURCES += \
wince* { wince* {
!contains(QT_CONFIG, no-jpeg): DEPLOYMENT_PLUGIN += qjpeg !contains(QT_CONFIG, no-jpeg): DEPLOYMENT_PLUGIN += qjpeg
} }
QT+=widgets

2
tests/auto/qmediaobject/main.cpp
View File

@@ -45,7 +45,7 @@
int main(int argc, char**argv) int main(int argc, char**argv)
{ {
QApplication app(argc,argv); QCoreApplication app(argc,argv);
int ret; int ret;
tst_QMediaObject test_api; tst_QMediaObject test_api;
ret = QTest::qExec(&test_api, argc, argv); ret = QTest::qExec(&test_api, argc, argv);

2
tests/auto/qmediaplayer/main.cpp
View File

@@ -45,7 +45,7 @@
int main(int argc, char**argv) int main(int argc, char**argv)
{ {
QApplication app(argc,argv); QCoreApplication app(argc,argv);
int ret; int ret;
tst_QMediaPlayer test_api; tst_QMediaPlayer test_api;
ret = QTest::qExec(&test_api, argc, argv); ret = QTest::qExec(&test_api, argc, argv);

2
tests/auto/qmediarecorder/main.cpp
View File

@@ -45,7 +45,7 @@
int main(int argc, char**argv) int main(int argc, char**argv)
{ {
QApplication app(argc,argv); QCoreApplication app(argc,argv);
int ret; int ret;
tst_QMediaRecorder test_api; tst_QMediaRecorder test_api;
ret = QTest::qExec(&test_api, argc, argv); ret = QTest::qExec(&test_api, argc, argv);

1
tests/auto/qpaintervideosurface/qpaintervideosurface.pro
View File

@@ -14,3 +14,4 @@ SOURCES += tst_qpaintervideosurface.cpp
# QPA-minimal and OpenGL don't get along # QPA-minimal and OpenGL don't get along
qpa:CONFIG += insignificant_test qpa:CONFIG += insignificant_test
QT+=widgets

2
tests/auto/qradiotuner/main.cpp
View File

@@ -45,7 +45,7 @@
int main(int argc, char**argv) int main(int argc, char**argv)
{ {
QApplication app(argc,argv); QCoreApplication app(argc,argv);
int ret; int ret;
tst_QRadioTuner test_api; tst_QRadioTuner test_api;
ret = QTest::qExec(&test_api, argc, argv); ret = QTest::qExec(&test_api, argc, argv);

1
tests/auto/qvideowidget/qvideowidget.pro
View File

@@ -7,3 +7,4 @@ SOURCES += tst_qvideowidget.cpp
# QPA seems to break some assumptions # QPA seems to break some assumptions
qpa:CONFIG += insignificant_test qpa:CONFIG += insignificant_test
QT+=widgets