diff options
author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-06-08 11:39:06 +0300 |
---|---|---|
committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-08-22 12:51:40 +0000 |
commit | c341b2b25697f937280fe3620629ac3d32c19613 (patch) | |
tree | 79d08e0061ca341e5f5f23dccba8804e395a28a6 /tests/auto/integration/shared | |
parent | ba79c575860231548b8fd8309c5f6d2b715860ca (diff) |
Enable tests for boot2qt
The tests for boot2qt were disabled with commit
b9bfe241cc3c3466ad250da80b2a7ccf087706a4. The tests can
be enabled since qtdeclarative now fallbacks to software
renderer if OpenGL is not supported.
Two changes were needed to pass tests on boot2qt
1. Add option to disable tests requiring WAV format and use
that in the boot2qt environment
2. Skip some tst_QPainterVideoSurface tests if GLContext is
not supported by the platform
Task-number: QTBUG-60268
Change-Id: I236207fedb505124a2c7edf0caccd85011ab1416
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/integration/shared')
-rw-r--r-- | tests/auto/integration/shared/mediafileselector.h | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/tests/auto/integration/shared/mediafileselector.h b/tests/auto/integration/shared/mediafileselector.h new file mode 100644 index 000000000..8b88d14a4 --- /dev/null +++ b/tests/auto/integration/shared/mediafileselector.h @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MEDIAFILESELECTOR_H +#define MEDIAFILESELECTOR_H + +#include <QMediaContent> +#include <QMediaPlayer> + +QT_BEGIN_NAMESPACE + +namespace MediaFileSelector { + +static QMediaContent selectMediaFile(const QStringList& mediaCandidates) +{ + QMediaPlayer player; + + QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error))); + + foreach (QString s, mediaCandidates) { + QFileInfo mediaFile(s); + if (!mediaFile.exists()) + continue; + QMediaContent media = QMediaContent(QUrl::fromLocalFile(mediaFile.absoluteFilePath())); + player.setMedia(media); + player.play(); + + for (int i = 0; i < 2000 && player.mediaStatus() != QMediaPlayer::BufferedMedia && errorSpy.isEmpty(); i+=50) { + QTest::qWait(50); + } + + if (player.mediaStatus() == QMediaPlayer::BufferedMedia && errorSpy.isEmpty()) { + return media; + } + errorSpy.clear(); + } + + return QMediaContent(); +} + +} // MediaFileSelector namespace + +QT_END_NAMESPACE + +#endif + |