From ebfdb73b75e5ae47ffb6d38c84dad12d21786edc Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 30 Nov 2011 14:58:53 +0100 Subject: qtbase: Remove QSound. Which currently causes tests not to compile on Windows due to missing symbols in QtWidgets (QSound::QSound() ,etc). Change-Id: I87f0a403e61c3a67f9a758f114e33db1012e33e8 Reviewed-by: Michael Goddard Reviewed-by: Lars Knoll --- tests/auto/widgets/kernel/kernel.pro | 1 - tests/auto/widgets/kernel/qsound/.gitignore | 1 - tests/auto/widgets/kernel/qsound/4.wav | Bin 5538 -> 0 bytes tests/auto/widgets/kernel/qsound/qsound.pro | 12 ---- tests/auto/widgets/kernel/qsound/tst_qsound.cpp | 83 ------------------------ 5 files changed, 97 deletions(-) delete mode 100644 tests/auto/widgets/kernel/qsound/.gitignore delete mode 100644 tests/auto/widgets/kernel/qsound/4.wav delete mode 100644 tests/auto/widgets/kernel/qsound/qsound.pro delete mode 100644 tests/auto/widgets/kernel/qsound/tst_qsound.cpp (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro index f6d0902533..d1f2304378 100644 --- a/tests/auto/widgets/kernel/kernel.pro +++ b/tests/auto/widgets/kernel/kernel.pro @@ -9,7 +9,6 @@ SUBDIRS=\ qgridlayout \ qinputcontext \ qlayout \ - qsound \ qstackedlayout \ qtooltip \ qwidget \ diff --git a/tests/auto/widgets/kernel/qsound/.gitignore b/tests/auto/widgets/kernel/qsound/.gitignore deleted file mode 100644 index c9d313c2cf..0000000000 --- a/tests/auto/widgets/kernel/qsound/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qsound diff --git a/tests/auto/widgets/kernel/qsound/4.wav b/tests/auto/widgets/kernel/qsound/4.wav deleted file mode 100644 index e31b060908..0000000000 Binary files a/tests/auto/widgets/kernel/qsound/4.wav and /dev/null differ diff --git a/tests/auto/widgets/kernel/qsound/qsound.pro b/tests/auto/widgets/kernel/qsound/qsound.pro deleted file mode 100644 index 8317283d54..0000000000 --- a/tests/auto/widgets/kernel/qsound/qsound.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsound -SOURCES += tst_qsound.cpp -QT += testlib widgets - -wince* { - deploy.files += 4.wav - DEPLOYMENT += deploy - DEFINES += SRCDIR=\\\"\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} diff --git a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp deleted file mode 100644 index 5f1e5fb47c..0000000000 --- a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include -#include - -class tst_QSound : public QObject -{ - Q_OBJECT - -public: - tst_QSound( QObject* parent=0) : QObject(parent) {} - -private slots: - void checkFinished(); - - // Manual tests - void staticPlay(); -}; - -void tst_QSound::checkFinished() -{ - QSKIP("QSound is not implemented on Lighthouse"); - QSound sound(SRCDIR"4.wav"); - sound.setLoops(3); - sound.play(); - QTest::qWait(5000); - -#if defined(Q_WS_QWS) - QEXPECT_FAIL("", "QSound buggy on embedded (task QTBUG-157)", Abort); -#endif - QVERIFY(sound.isFinished() ); -} - -void tst_QSound::staticPlay() -{ - QSKIP("Test disabled -- only for manual purposes"); - // Check that you hear sound with static play also. - QSound::play(SRCDIR"4.wav"); - QTest::qWait(2000); -} - -QTEST_MAIN(tst_QSound); -#include "tst_qsound.moc" -- cgit v1.2.3