summaryrefslogtreecommitdiffstats
path: root/tests/manual/sharedtextureqml
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-10-28 10:02:00 +0100
committerPaul Lemire <paul.lemire@kdab.com>2019-10-31 12:04:49 +0100
commitfae98c57264e78e62c5955559c7e513969462a79 (patch)
tree6db9e5978a4dae1dcf42a71d696906c40e3ccbf4 /tests/manual/sharedtextureqml
parentdb9f0721c4406843766aab66d1cae170e76a237d (diff)
Fix SharedTexture manual tests
Remove VideoPlayer thread, not needed and could yield to asserts if QOpenGLContext::makeCurrent is called from another thread than the one it was created with, depending on platforms and QApplication flags being set. Change-Id: Ic5d1858e5356b16293ee6298558dd7c60f3c86dd Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests/manual/sharedtextureqml')
-rw-r--r--tests/manual/sharedtextureqml/main.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/manual/sharedtextureqml/main.cpp b/tests/manual/sharedtextureqml/main.cpp
index 5c7ae9cff..c0a79e6f8 100644
--- a/tests/manual/sharedtextureqml/main.cpp
+++ b/tests/manual/sharedtextureqml/main.cpp
@@ -108,8 +108,7 @@ int main(int argc, char* argv[])
// Multimedia player
TextureWidget textureWidget;
- VideoPlayerThread *videoPlayer = new VideoPlayerThread(&textureWidget);
- videoPlayer->start();
+ VideoPlayer *videoPlayer = new VideoPlayer(&textureWidget);
textureWidget.resize(800, 600);
textureWidget.show();