Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	doc/src/classes/qnamespace.qdoc
	examples/examples.pro
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qobject.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qstandardgestures.h
	src/gui/kernel/qwidget.cpp

22 files changed, 929 insertions, 19 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 1e349d8..7fcbf46 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -286,6 +286,10 @@ SUBDIRS += _networkselftest \
            qsocks5socketengine \
            qsortfilterproxymodel \
            qsound \
+           qaudiodeviceid \
+           qaudioformat \
+           qaudiooutput \
+           qaudioinput \
            qspinbox \
            qsplitter \
            qsql \
diff --git a/tests/auto/qaudiodeviceid/qaudiodeviceid.pro b/tests/auto/qaudiodeviceid/qaudiodeviceid.pro
new file mode 100644
index 0000000..e0c7d4d
--- /dev/null
+++ b/tests/auto/qaudiodeviceid/qaudiodeviceid.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+SOURCES += tst_qaudiodeviceid.cpp
+
+QT = core multimedia
diff --git a/tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp b/tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp
new file mode 100644
index 0000000..d40118b
--- /dev/null
+++ b/tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtCore/qlocale.h>
+#include <qaudiodeviceid.h>
+#include <qaudiodeviceinfo.h>
+
+#include <QStringList>
+#include <QList>
+
+
+class tst_QAudioDeviceId : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QAudioDeviceId(QObject* parent=0) : QObject(parent) {}
+
+private slots:
+    void checkNull();
+    void checkEquality();
+};
+
+void tst_QAudioDeviceId::checkNull()
+{
+    // Default constructed is null.
+    QAudioDeviceId deviceId0;
+    QVERIFY(deviceId0.isNull());
+
+    // Null is transferred
+    QAudioDeviceId deviceId1(deviceId0);
+    QVERIFY(deviceId1.isNull());
+}
+
+void tst_QAudioDeviceId::checkEquality()
+{
+    QAudioDeviceId  deviceId0;
+    QAudioDeviceId  deviceId1;
+
+    // Null ids are equivalent
+    QVERIFY(deviceId0 == deviceId1);
+    QVERIFY(!(deviceId0 != deviceId1));
+
+    deviceId1 = QAudioDeviceInfo::defaultOutputDevice();
+
+    // Different
+    QVERIFY(deviceId0 != deviceId1);
+    QVERIFY(!(deviceId0 == deviceId1));
+
+    // Same
+    deviceId0 = deviceId1;
+
+    QVERIFY(deviceId0 == deviceId1);
+    QVERIFY(!(deviceId0 != deviceId1));
+}
+
+QTEST_MAIN(tst_QAudioDeviceId)
+
+#include "tst_qaudiodeviceid.moc"
diff --git a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro
new file mode 100644
index 0000000..695987c
--- /dev/null
+++ b/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+SOURCES += tst_qaudiodeviceinfo.cpp
+
+QT = core multimedia
diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
new file mode 100644
index 0000000..c2cd97e
--- /dev/null
+++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -0,0 +1,159 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <QtCore/qlocale.h>
+#include <qaudiodeviceinfo.h>
+
+#include <QStringList>
+#include <QList>
+
+
+class tst_QAudioDeviceInfo : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QAudioDeviceInfo(QObject* parent=0) : QObject(parent) {}
+
+private slots:
+    void checkAvailableDefaultInput();
+    void checkAvailableDefaultOutput();
+    void outputList();
+    void codecs();
+    void channels();
+    void sampleSizes();
+    void byteOrders();
+    void sampleTypes();
+    void frequencies();
+    void isformat();
+    void preferred();
+    void nearest();
+
+private:
+    QAudioDeviceInfo* device;
+};
+
+void tst_QAudioDeviceInfo::checkAvailableDefaultInput()
+{
+    QVERIFY(!QAudioDeviceInfo::defaultInputDevice().isNull());
+}
+
+void tst_QAudioDeviceInfo::checkAvailableDefaultOutput()
+{
+    QVERIFY(!QAudioDeviceInfo::defaultOutputDevice().isNull());
+}
+
+void tst_QAudioDeviceInfo::outputList()
+{
+    QList<QAudioDeviceId> devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput);
+    QVERIFY(devices.size() > 0);
+    device = new QAudioDeviceInfo(devices.at(0), this);
+}
+
+void tst_QAudioDeviceInfo::codecs()
+{
+    QStringList avail = device->supportedCodecs();
+    QVERIFY(avail.size() > 0);
+}
+
+void tst_QAudioDeviceInfo::channels()
+{
+    QList<int> avail = device->supportedChannels();
+    QVERIFY(avail.size() > 0);
+}
+
+void tst_QAudioDeviceInfo::sampleSizes()
+{
+    QList<int> avail = device->supportedSampleSizes();
+    QVERIFY(avail.size() > 0);
+}
+
+void tst_QAudioDeviceInfo::byteOrders()
+{
+    QList<QAudioFormat::Endian> avail = device->supportedByteOrders();
+    QVERIFY(avail.size() > 0);
+}
+
+void tst_QAudioDeviceInfo::sampleTypes()
+{
+    QList<QAudioFormat::SampleType> avail = device->supportedSampleTypes();
+    QVERIFY(avail.size() > 0);
+}
+
+void tst_QAudioDeviceInfo::frequencies()
+{
+    QList<int> avail = device->supportedFrequencies();
+    QVERIFY(avail.size() > 0);
+}
+
+void tst_QAudioDeviceInfo::isformat()
+{
+    QAudioFormat     format;
+    format.setFrequency(44100);
+    format.setChannels(2);
+    format.setSampleType(QAudioFormat::SignedInt);
+    format.setByteOrder(QAudioFormat::LittleEndian);
+    format.setSampleSize(16);
+    format.setCodec("audio/pcm");
+
+    // Should always be true for these format
+    QVERIFY(device->isFormatSupported(format));
+}
+
+void tst_QAudioDeviceInfo::preferred()
+{
+    QAudioFormat format = device->preferredFormat();
+    QVERIFY(format.frequency() == 44100);
+    QVERIFY(format.channels() == 2);
+}
+
+void tst_QAudioDeviceInfo::nearest()
+{
+    QAudioFormat format1, format2;
+    format1.setFrequency(8000);
+    format2 = device->nearestFormat(format1);
+    QVERIFY(format2.frequency() == 44100);
+}
+
+QTEST_MAIN(tst_QAudioDeviceInfo)
+
+#include "tst_qaudiodeviceinfo.moc"
diff --git a/tests/auto/qaudioformat/qaudioformat.pro b/tests/auto/qaudioformat/qaudioformat.pro
new file mode 100644
index 0000000..78962d7
--- /dev/null
+++ b/tests/auto/qaudioformat/qaudioformat.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+SOURCES += tst_qaudioformat.cpp
+
+QT = core multimedia
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
new file mode 100644
index 0000000..bcfc78f
--- /dev/null
+++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp
@@ -0,0 +1,180 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <QtCore/qlocale.h>
+#include <qaudioformat.h>
+
+#include <QStringList>
+#include <QList>
+
+
+class tst_QAudioFormat : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QAudioFormat(QObject* parent=0) : QObject(parent) {}
+
+private slots:
+    void checkNull();
+    void checkFrequency();
+    void checkChannels();
+    void checkSampleSize();
+    void checkCodec();
+    void checkByteOrder();
+    void checkSampleType();
+    void checkEquality();
+    void checkAssignment();
+};
+
+void tst_QAudioFormat::checkNull()
+{
+    // Default constructed QAudioFormat is null.
+    QAudioFormat    audioFormat0;
+    QVERIFY(audioFormat0.isNull());
+
+    // Null is transferred
+    QAudioFormat    audioFormat1(audioFormat0);
+    QVERIFY(audioFormat1.isNull());
+
+    // Null is voided on activity
+    audioFormat0.setFrequency(44100);
+    QVERIFY(!audioFormat0.isNull());
+}
+
+void tst_QAudioFormat::checkFrequency()
+{
+    QAudioFormat    audioFormat;
+    audioFormat.setFrequency(44100);
+    QVERIFY(audioFormat.frequency() == 44100);
+}
+
+void tst_QAudioFormat::checkChannels()
+{
+    QAudioFormat    audioFormat;
+    audioFormat.setChannels(2);
+    QVERIFY(audioFormat.channels() == 2);
+}
+
+void tst_QAudioFormat::checkSampleSize()
+{
+    QAudioFormat    audioFormat;
+    audioFormat.setSampleSize(16);
+    QVERIFY(audioFormat.sampleSize() == 16);
+}
+
+void tst_QAudioFormat::checkCodec()
+{
+    QAudioFormat    audioFormat;
+    audioFormat.setCodec(QString::fromLatin1("audio/pcm"));
+    QVERIFY(audioFormat.codec() == QString::fromLatin1("audio/pcm"));
+}
+
+void tst_QAudioFormat::checkByteOrder()
+{
+    QAudioFormat    audioFormat;
+    audioFormat.setByteOrder(QAudioFormat::LittleEndian);
+    QVERIFY(audioFormat.byteOrder() == QAudioFormat::LittleEndian);
+}
+
+void tst_QAudioFormat::checkSampleType()
+{
+    QAudioFormat    audioFormat;
+    audioFormat.setSampleType(QAudioFormat::SignedInt);
+    QVERIFY(audioFormat.sampleType() == QAudioFormat::SignedInt);
+}
+
+void tst_QAudioFormat::checkEquality()
+{
+    QAudioFormat    audioFormat0;
+    QAudioFormat    audioFormat1;
+
+    // Null formats are equivalent
+    QVERIFY(audioFormat0 == audioFormat1);
+    QVERIFY(!(audioFormat0 != audioFormat1));
+
+    // on filled formats
+    audioFormat0.setFrequency(8000);
+    audioFormat0.setChannels(1);
+    audioFormat0.setSampleSize(8);
+    audioFormat0.setCodec("audio/pcm");
+    audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
+    audioFormat0.setSampleType(QAudioFormat::UnSignedInt);
+
+    audioFormat1.setFrequency(8000);
+    audioFormat1.setChannels(1);
+    audioFormat1.setSampleSize(8);
+    audioFormat1.setCodec("audio/pcm");
+    audioFormat1.setByteOrder(QAudioFormat::LittleEndian);
+    audioFormat1.setSampleType(QAudioFormat::UnSignedInt);
+
+    QVERIFY(audioFormat0 == audioFormat1);
+    QVERIFY(!(audioFormat0 != audioFormat1));
+
+    audioFormat0.setFrequency(44100);
+    QVERIFY(audioFormat0 != audioFormat1);
+    QVERIFY(!(audioFormat0 == audioFormat1));
+}
+
+void tst_QAudioFormat::checkAssignment()
+{
+    QAudioFormat    audioFormat0;
+    QAudioFormat    audioFormat1;
+
+    audioFormat0.setFrequency(8000);
+    audioFormat0.setChannels(1);
+    audioFormat0.setSampleSize(8);
+    audioFormat0.setCodec("audio/pcm");
+    audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
+    audioFormat0.setSampleType(QAudioFormat::UnSignedInt);
+
+    audioFormat1 = audioFormat0;
+    QVERIFY(audioFormat1 == audioFormat0);
+
+    QAudioFormat    audioFormat2(audioFormat0);
+    QVERIFY(audioFormat2 == audioFormat0);
+}
+
+QTEST_MAIN(tst_QAudioFormat)
+
+#include "tst_qaudioformat.moc"
diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro
new file mode 100644
index 0000000..8a03749
--- /dev/null
+++ b/tests/auto/qaudioinput/qaudioinput.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+SOURCES += tst_qaudioinput.cpp
+
+QT = core multimedia
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
new file mode 100644
index 0000000..6e16320
--- /dev/null
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtCore/qlocale.h>
+#include <qaudioinput.h>
+#include <qaudiodeviceinfo.h>
+#include <qaudio.h>
+#include <qaudioformat.h>
+
+
+class tst_QAudioInput : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QAudioInput(QObject* parent=0) : QObject(parent) {}
+
+private slots:
+    void initTestCase();
+    void settings();
+    void notifyInterval();
+    void pullFile();
+
+private:
+    QAudioFormat   format;
+    QAudioInput*   audio;
+};
+
+void tst_QAudioInput::initTestCase()
+{
+    format.setFrequency(8000);
+    format.setChannels(1);
+    format.setSampleSize(8);
+    format.setCodec("audio/pcm");
+    format.setByteOrder(QAudioFormat::LittleEndian);
+    format.setSampleType(QAudioFormat::UnSignedInt);
+
+    audio = new QAudioInput(format, this);
+}
+
+void tst_QAudioInput::settings()
+{
+    QAudioFormat f = audio->format();
+
+    QVERIFY(format.channels() == f.channels());
+    QVERIFY(format.frequency() == f.frequency());
+    QVERIFY(format.sampleSize() == f.sampleSize());
+    QVERIFY(format.codec() == f.codec());
+    QVERIFY(format.byteOrder() == f.byteOrder());
+    QVERIFY(format.sampleType() == f.sampleType());
+}
+
+void tst_QAudioInput::notifyInterval()
+{
+    QVERIFY(audio->notifyInterval() == 1000);   // Default
+
+    audio->setNotifyInterval(500);
+    QVERIFY(audio->notifyInterval() == 500);    // Custom
+
+    audio->setNotifyInterval(1000);             // reset
+}
+
+void tst_QAudioInput::pullFile()
+{
+    QFile filename(SRCDIR "test.raw");
+    filename.open( QIODevice::WriteOnly | QIODevice::Truncate );
+
+    QSignalSpy readSignal(audio, SIGNAL(notify()));
+    audio->start(&filename);
+
+    QTest::qWait(5000);
+
+    QVERIFY(readSignal.count() > 0);
+    QVERIFY(audio->totalTime() > 0);
+
+    audio->stop();
+    filename.close();
+}
+
+QTEST_MAIN(tst_QAudioInput)
+
+#include "tst_qaudioinput.moc"
diff --git a/tests/auto/qaudiooutput/4.wav b/tests/auto/qaudiooutput/4.wav
new file mode 100644
index 0000000..e31b0609
--- /dev/null
+++ b/tests/auto/qaudiooutput/4.wav
diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/qaudiooutput/qaudiooutput.pro
new file mode 100644
index 0000000..6c07c64
--- /dev/null
+++ b/tests/auto/qaudiooutput/qaudiooutput.pro
@@ -0,0 +1,12 @@
+load(qttest_p4)
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+SOURCES += tst_qaudiooutput.cpp
+
+QT = core multimedia
+
+wince*: {
+   deploy.sources += 4.wav
+   DEPLOYMENT = deploy
+}
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
new file mode 100644
index 0000000..0f94faa
--- /dev/null
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+
+#include <QtTest/QtTest>
+#include <QtCore/qlocale.h>
+#include <qaudiooutput.h>
+#include <qaudiodeviceinfo.h>
+#include <qaudio.h>
+#include <qaudioformat.h>
+
+
+class tst_QAudioOutput : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QAudioOutput(QObject* parent=0) : QObject(parent) {}
+
+private slots:
+    void initTestCase();
+    void settings();
+    void notifyInterval();
+    void pullFile();
+    void pushFile();
+
+private:
+    QAudioFormat  format;
+    QAudioOutput* audio;
+};
+
+void tst_QAudioOutput::initTestCase()
+{
+    format.setFrequency(8000);
+    format.setChannels(1);
+    format.setSampleSize(8);
+    format.setCodec("audio/pcm");
+    format.setByteOrder(QAudioFormat::LittleEndian);
+    format.setSampleType(QAudioFormat::UnSignedInt);
+
+    audio = new QAudioOutput(format, this);
+}
+
+void tst_QAudioOutput::settings()
+{
+    QAudioFormat f = audio->format();
+
+    QVERIFY(format.channels() == f.channels());
+    QVERIFY(format.frequency() == f.frequency());
+    QVERIFY(format.sampleSize() == f.sampleSize());
+    QVERIFY(format.codec() == f.codec());
+    QVERIFY(format.byteOrder() == f.byteOrder());
+    QVERIFY(format.sampleType() == f.sampleType());
+}
+
+void tst_QAudioOutput::notifyInterval()
+{
+    QVERIFY(audio->notifyInterval() == 1000);   // Default
+
+    audio->setNotifyInterval(500);
+    QVERIFY(audio->notifyInterval() == 500);    // Custom
+
+    audio->setNotifyInterval(1000);             // reset
+}
+
+void tst_QAudioOutput::pullFile()
+{
+    QFile filename(SRCDIR "4.wav");
+    QVERIFY(filename.exists());
+    filename.open(QIODevice::ReadOnly);
+
+    QSignalSpy readSignal(audio, SIGNAL(notify()));
+    audio->setNotifyInterval(100);
+    audio->start(&filename);
+
+    QTestEventLoop::instance().enterLoop(1);
+    // 4.wav is a little less than 700ms, so notify should fire 6 times!
+    QVERIFY(readSignal.count() >= 6);
+    QVERIFY(audio->totalTime() == 692250);
+
+    audio->stop();
+    filename.close();
+}
+
+void tst_QAudioOutput::pushFile()
+{
+    QFile filename(SRCDIR "4.wav");
+    QVERIFY(filename.exists());
+    filename.open(QIODevice::ReadOnly);
+
+    const qint64 fileSize = filename.size();
+
+    QIODevice* feed = audio->start(0);
+
+    char* buffer = new char[fileSize];
+    filename.read(buffer, fileSize);
+
+    qint64 counter=0;
+    qint64 written=0;
+    while(written < fileSize) {
+        written+=feed->write(buffer+written,fileSize-written);
+        QTest::qWait(20);
+        counter++;
+    }
+    QTestEventLoop::instance().enterLoop(1);
+
+    QVERIFY(written == fileSize);
+    QVERIFY(audio->totalTime() == 692250);
+
+    audio->stop();
+    filename.close();
+    delete [] buffer;
+    delete audio;
+}
+
+QTEST_MAIN(tst_QAudioOutput)
+
+#include "tst_qaudiooutput.moc"
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 8239b03..558688f 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -169,6 +169,7 @@ private slots:
     void setParentItem();
     void children();
     void flags();
+    void inputMethodHints();
     void toolTip();
     void visible();
     void explicitlyVisible();
@@ -760,6 +761,34 @@ void tst_QGraphicsItem::flags()
         QApplication::sendEvent(&scene, &event5);
         QCOMPARE(item->pos(), QPointF(10, 10));
     }
+    {
+        QGraphicsItem* clippingParent = new QGraphicsRectItem;
+        clippingParent->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
+
+        QGraphicsItem* nonClippingParent = new QGraphicsRectItem;
+        nonClippingParent->setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
+
+        QGraphicsItem* child = new QGraphicsRectItem(nonClippingParent);
+        QVERIFY(!child->isClipped());
+
+        child->setParentItem(clippingParent);
+        QVERIFY(child->isClipped());
+
+        child->setParentItem(nonClippingParent);
+        QVERIFY(!child->isClipped());
+    }
+}
+
+class ImhTester : public QGraphicsItem
+{
+    QRectF boundingRect() const { return QRectF(); }
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+};
+
+void tst_QGraphicsItem::inputMethodHints()
+{
+    ImhTester item;
+    QCOMPARE(item.inputMethodHints(), Qt::ImhNone);
 }
 
 void tst_QGraphicsItem::toolTip()
diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
index df0853b..31247b3 100644
--- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
@@ -61,6 +61,7 @@
 #include <QAbstractItemDelegate>
 #include <QTextEdit>
 #include <QPlainTextEdit>
+#include <QDialog>
 
 Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint)
 
@@ -230,6 +231,8 @@ private slots:
     void editorEvent();
     void enterKey_data();
     void enterKey();
+
+    void task257859_finalizeEdit();
 };
 
 
@@ -1127,6 +1130,36 @@ void tst_QItemDelegate::enterKey()
     }
 }
 
+void tst_QItemDelegate::task257859_finalizeEdit()
+{
+    QStandardItemModel model;
+    model.appendRow(new QStandardItem());
+
+    QListView view;
+    view.setModel(&model);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    view.setFocus();
+    QTest::qWait(30);
+
+    QModelIndex index = model.index(0, 0);
+    view.edit(index);
+    QTest::qWait(30);
+
+    QList<QWidget*> lineEditors = qFindChildren<QWidget *>(view.viewport());
+    QCOMPARE(lineEditors.count(), 1);
+
+    QPointer<QWidget> editor = lineEditors.at(0);
+    QCOMPARE(editor->hasFocus(), true);
+
+    QDialog dialog;
+    QTimer::singleShot(100, &dialog, SLOT(close()));
+    dialog.exec();
+
+    QTest::qWait(10);
+
+    QVERIFY(!editor);
+}
 
 
 // ### _not_ covered:
diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
index ae64e51..0541b46 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -1547,7 +1547,7 @@ void tst_QItemSelectionModel::resetModel()
     model.reset();
 
     QVERIFY(view.selectionModel()->selection().isEmpty());
-    QVERIFY(view.selectionModel()->hasSelection());
+    QVERIFY(view.selectionModel()->hasSelection() == false);
 
     view.selectionModel()->select(QItemSelection(model.index(0, 0), model.index(5, 5)), QItemSelectionModel::Select);
 
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index 70174e3..4945d11 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -96,6 +96,7 @@ private slots:
     void task256918_setFont();
     void menuSizeHint();
     void task258920_mouseBorder();
+    void setFixedWidth();
 protected slots:
     void onActivated(QAction*);
     void onHighlighted(QAction*);
@@ -805,6 +806,17 @@ void tst_QMenu::task258920_mouseBorder()
     QVERIFY(menu.painted);
 }
 
+void tst_QMenu::setFixedWidth()
+{
+    QMenu menu;
+    menu.addAction("action");
+    menu.setFixedWidth(300);
+    //the sizehint should reflect the minimumwidth because the action will try to
+    //get as much space as possible
+    QCOMPARE(menu.sizeHint().width(), menu.minimumWidth());
+}
+
+
 
 QTEST_MAIN(tst_QMenu)
 #include "tst_qmenu.moc"
diff --git a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
index d7d6b88..16c58b0 100644
--- a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
+++ b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -74,6 +74,7 @@ private slots:
     void loopCount_data();
     void loopCount();
     void autoAdd();
+    void pauseResume();
 };
 
 tst_QParallelAnimationGroup::tst_QParallelAnimationGroup()
@@ -828,5 +829,37 @@ void tst_QParallelAnimationGroup::autoAdd()
     QCOMPARE(group.duration(), 0);
 }
 
+void tst_QParallelAnimationGroup::pauseResume()
+{
+    QParallelAnimationGroup group;
+    TestAnimation2 *anim = new TestAnimation2(250, &group);      // 0, duration = 250;
+    QSignalSpy spy(anim, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
+    QCOMPARE(group.duration(), 250);
+    group.start();
+    QTest::qWait(100);
+    QCOMPARE(group.state(), QAnimationGroup::Running);
+    QCOMPARE(anim->state(), QAnimationGroup::Running);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+    const int currentTime = group.currentTime();
+    QCOMPARE(anim->currentTime(), currentTime);
+
+    group.pause();
+    QCOMPARE(group.state(), QAnimationGroup::Paused);
+    QCOMPARE(group.currentTime(), currentTime);
+    QCOMPARE(anim->state(), QAnimationGroup::Paused);
+    QCOMPARE(anim->currentTime(), currentTime);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+
+    group.resume();
+    QCOMPARE(group.state(), QAnimationGroup::Running);
+    QCOMPARE(group.currentTime(), currentTime);
+    QCOMPARE(anim->state(), QAnimationGroup::Running);
+    QCOMPARE(anim->currentTime(), currentTime);
+    QCOMPARE(spy.count(), 1);
+}
+
+
 QTEST_MAIN(tst_QParallelAnimationGroup)
 #include "tst_qparallelanimationgroup.moc"
diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h
index 8253541..f1e9d28 100644
--- a/tests/auto/qsqldatabase/tst_databases.h
+++ b/tests/auto/qsqldatabase/tst_databases.h
@@ -219,7 +219,7 @@ public:
 //         addDb( "QMYSQL3", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 3307 );
 //         addDb( "QMYSQL3", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 3308, "CLIENT_COMPRESS=1;CLIENT_SSL=1" ); // MySQL 4.1.1
 //         addDb( "QMYSQL3", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 3309, "CLIENT_COMPRESS=1;CLIENT_SSL=1" ); // MySQL 5.0.18 Linux
-//         addDb( "QMYSQL3", "testdb", "troll", "trond", "iceblink.nokia.troll.no" ); // MySQL 5.0.13 Windows
+//         addDb( "QMYSQL3", "testdb", "troll", "trond", "silence.nokia.troll.no" ); // MySQL 5.1.36 Windows
 //         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql4-nokia.trolltech.com.au" ); // MySQL 4.1.22-2.el4  linux
 //         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql5-nokia.trolltech.com.au" ); // MySQL 5.0.45-7.el5 linux
 
@@ -518,6 +518,16 @@ public:
             return QString();
     }
 
+    static QString getPSQLVersion( const QSqlDatabase &db )
+    {
+        QSqlQuery q(db);
+        q.exec( "select version()" );
+        if(q.next())
+            return q.value( 0 ).toString();
+        else
+            return QString();
+    }
+
     QStringList     dbNames;
     int      counter;
 };
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index 4cf8d56..fe4c86e 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -1054,6 +1054,7 @@ void tst_QSqlDatabase::recordMySQL()
     int major = tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt();
     int minor = tst_Databases::getMySqlVersion( db ).section( QChar('.'), 1, 1 ).toInt();
     int revision = tst_Databases::getMySqlVersion( db ).section( QChar('.'), 2, 2 ).toInt();
+    int vernum = (major << 16) + (minor << 8) + revision;
 
 #ifdef QT3_SUPPORT
     /* The below is broken in mysql below 5.0.15
@@ -1061,7 +1062,7 @@ void tst_QSqlDatabase::recordMySQL()
         specifically: Before MySQL 5.0.15, the pad value is space. Values are right-padded
         with space on insert, and trailing spaces are removed on select.
     */
-    if ( major >5 || ( major == 5 && minor > 0) || ( major == 5 && minor == 0 && revision >= 15) ) {
+    if( vernum >= ((5 << 16) + 15) ) {
         bin10 = FieldDef("binary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abc    ")));
         varbin10 = FieldDef("varbinary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abcv   ")));
     }
@@ -1591,6 +1592,11 @@ void tst_QSqlDatabase::bug_249059()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
 
+    QString version=tst_Databases::getPSQLVersion( db );
+    double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble();
+    if (ver < 7.3)
+        QSKIP("Test requires PostgreSQL >= 7.3", SkipSingle);
+
     QSqlQuery q(db);
     QString tableName = qTableName("bug_249059");
     QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (dt timestamp, t time)").arg(tableName)));
@@ -2025,8 +2031,6 @@ void tst_QSqlDatabase::mysql_multiselect()
     CHECK_DATABASE(db);
 
     QSqlQuery q(db);
-    QVERIFY_SQL(q, exec("select version()"));
-    QVERIFY_SQL(q, next());
     QString version=tst_Databases::getMySqlVersion( db );
     double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble();
     if (ver < 4.1)
diff --git a/tests/auto/tests.xml b/tests/auto/tests.xml
index a5386b2..ccfc380 100644
--- a/tests/auto/tests.xml
+++ b/tests/auto/tests.xml
@@ -271,6 +271,10 @@
         <Test name="qsocks5socketengine" location="tests/auto/qsocks5socketengine/tst_qsocks5socketengine" />
         <Test name="qsortfilterproxymodel" location="tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel" />
         <Test name="qsound" location="tests/auto/qsound/tst_qsound" />
+        <Test name="qaudiodeviceid" location="tests/auto/qaudiodeviceid/tst_qaudiodeviceid" />
+        <Test name="qaudioformat" location="tests/auto/qaudioformat/tst_qaudioformat" />
+        <Test name="qaudiooutput" location="tests/auto/qaudiooutput/tst_qaudiooutput" />
+        <Test name="qaudioinput" location="tests/auto/qaudioinput/tst_qaudioinput" />
         <Test name="qsourcelocation" location="tests/auto/qsourcelocation/tst_qsourcelocation" />
         <Test name="qspinbox" location="tests/auto/qspinbox/tst_qspinbox" />
         <Test name="qsplitter" location="tests/auto/qsplitter/tst_qsplitter" />
@@ -676,6 +680,10 @@
             <Test id="qsocks5socketengine" />
             <Test id="qsortfilterproxymodel" />
             <Test id="qsound" />
+            <Test id="qaudiodeviceid" />
+            <Test id="qaudioformat" />
+            <Test id="qaudiooutput" />
+            <Test id="qaudioinput" />
             <Test id="qsourcelocation" />
             <Test id="qspinbox" />
             <Test id="qsplitter" />
diff --git a/tests/benchmarks/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/qgraphicsitem/qgraphicsitem.pro
index c8fc07b..726bb96 100644
--- a/tests/benchmarks/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/benchmarks/qgraphicsitem/qgraphicsitem.pro
@@ -3,4 +3,3 @@ TEMPLATE = app
 TARGET = tst_qgraphicsitem
 
 SOURCES += tst_qgraphicsitem.cpp
-
diff --git a/tests/benchmarks/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/benchmarks/qgraphicsitem/tst_qgraphicsitem.cpp
index d072d08..ee27ebe 100644
--- a/tests/benchmarks/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/benchmarks/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -25,6 +25,9 @@ public slots:
     void cleanup();
 
 private slots:
+    void setParentItem();
+    void setParentItem_deep();
+    void deleteItemWithManyChildren();
     void setPos_data();
     void setPos();
     void setTransform_data();
@@ -34,7 +37,6 @@ private slots:
     void shear();
     void translate();
     void setRotation();
-    void setRotationXYZ();
 };
 
 tst_QGraphicsItem::tst_QGraphicsItem()
@@ -53,6 +55,40 @@ void tst_QGraphicsItem::cleanup()
 {
 }
 
+void tst_QGraphicsItem::setParentItem()
+{
+    QBENCHMARK {
+        QGraphicsRectItem rect;
+        QGraphicsRectItem *childRect = new QGraphicsRectItem;
+        childRect->setParentItem(&rect);
+    }
+}
+
+void tst_QGraphicsItem::setParentItem_deep()
+{
+    QBENCHMARK {
+        QGraphicsRectItem rect;
+        QGraphicsRectItem *lastRect = &rect;
+        for (int i = 0; i < 10; ++i) {
+            QGraphicsRectItem *childRect = new QGraphicsRectItem;
+            childRect->setParentItem(lastRect);
+            lastRect = childRect;
+        }
+        QGraphicsItem *first = rect.children().first();
+        first->setParentItem(0);
+    }
+}
+
+void tst_QGraphicsItem::deleteItemWithManyChildren()
+{
+    QBENCHMARK {
+        QGraphicsRectItem *rect = new QGraphicsRectItem;
+        for (int i = 0; i < 1000; ++i)
+            new QGraphicsRectItem(rect);
+        delete rect;
+    }
+}
+
 void tst_QGraphicsItem::setPos_data()
 {
     QTest::addColumn<QPointF>("pos");
@@ -150,18 +186,7 @@ void tst_QGraphicsItem::setRotation()
     QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
 
     QBENCHMARK {
-        item->setXRotation(45);
-        item->transform(); // prevent lazy optimizing
-    }
-}
-
-void tst_QGraphicsItem::setRotationXYZ()
-{
-    QGraphicsScene scene;
-    QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
-
-    QBENCHMARK {
-        item->setRotation(45, 45, 45);
+        item->setRotation(45);
         item->transform(); // prevent lazy optimizing
     }
 }