diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-18 05:39:42 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-18 05:41:14 (GMT) |
| commit | c166173cde49ad76bc8c6904df01af8cfe8eb401 (patch) | |
| tree | 27bbdb671f945aaee988456e3e206680df144eac /tests/auto/qvideowidget | |
| parent | f36f21bcdcb6b0ef1edf8e3733842e7837f45b56 (diff) | |
| download | Qt-c166173cde49ad76bc8c6904df01af8cfe8eb401.zip Qt-c166173cde49ad76bc8c6904df01af8cfe8eb401.tar.gz Qt-c166173cde49ad76bc8c6904df01af8cfe8eb401.tar.bz2 | |
Disable the full screen video widget tests on X11.
Too susceptible to timing problems.
Diffstat (limited to 'tests/auto/qvideowidget')
| -rw-r--r-- | tests/auto/qvideowidget/tst_qvideowidget.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/qvideowidget/tst_qvideowidget.cpp index 9da4b9e..f703055 100644 --- a/tests/auto/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/qvideowidget/tst_qvideowidget.cpp @@ -69,7 +69,6 @@ private slots: void setMediaObject(); void showWindowControl(); - void fullScreenWindowControl(); void aspectRatioWindowControl(); void sizeHintWindowControl_data() { sizeHint_data(); } void sizeHintWindowControl(); @@ -83,7 +82,6 @@ private slots: void saturationWindowControl(); void showWidgetControl(); - void fullScreenWidgetControl(); void aspectRatioWidgetControl(); void sizeHintWidgetControl_data() { sizeHint_data(); } void sizeHintWidgetControl(); @@ -97,7 +95,6 @@ private slots: void saturationWidgetControl(); void showRendererControl(); - void fullScreenRendererControl(); void aspectRatioRendererControl(); void sizeHintRendererControl_data(); void sizeHintRendererControl(); @@ -112,6 +109,12 @@ private slots: void paintRendererControl(); +#ifndef Q_WS_X11 + void fullScreenWindowControl(); + void fullScreenWidgetControl(); + void fullScreenRendererControl(); +#endif + private: void sizeHint_data(); void color_data(); @@ -890,6 +893,7 @@ void tst_QVideoWidget::sizeHintRendererControl() QCOMPARE(widget.sizeHint(), expectedSize); } +#ifndef Q_WS_X11 void tst_QVideoWidget::fullScreenWindowControl() { @@ -1115,6 +1119,7 @@ void tst_QVideoWidget::fullScreenRendererControl() QCOMPARE(spy.count(), 5); } +#endif void tst_QVideoWidget::color_data() { |