Merge remote branch 'origin/4.7' into master-from-4.7

6 files changed, 168 insertions, 26 deletions

diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index 84c3874..1808b1d 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -50,6 +50,8 @@
 #define SRCDIR ""
 #endif
 
+Q_DECLARE_METATYPE(QAudioFormat)
+
 class tst_QAudioInput : public QObject
 {
     Q_OBJECT
@@ -58,6 +60,8 @@ public:
 
 private slots:
     void initTestCase();
+    void invalidFormat_data();
+    void invalidFormat();
     void settings();
     void buffers();
     void notifyInterval();
@@ -71,6 +75,8 @@ private:
 
 void tst_QAudioInput::initTestCase()
 {
+    qRegisterMetaType<QAudioFormat>();
+
     format.setFrequency(8000);
     format.setChannels(1);
     format.setSampleSize(8);
@@ -91,6 +97,47 @@ void tst_QAudioInput::initTestCase()
         audio = new QAudioInput(format, this);
 }
 
+void tst_QAudioInput::invalidFormat_data()
+{
+    QTest::addColumn<QAudioFormat>("invalidFormat");
+
+    QAudioFormat audioFormat;
+
+    QTest::newRow("Null Format")
+            << audioFormat;
+
+    audioFormat = format;
+    audioFormat.setChannels(0);
+    QTest::newRow("Channel count 0")
+            << audioFormat;
+
+    audioFormat = format;
+    audioFormat.setFrequency(0);
+    QTest::newRow("Sample rate 0")
+            << audioFormat;
+
+    audioFormat = format;
+    audioFormat.setSampleSize(0);
+    QTest::newRow("Sample size 0")
+            << audioFormat;
+}
+
+void tst_QAudioInput::invalidFormat()
+{
+    QFETCH(QAudioFormat, invalidFormat);
+
+    QAudioInput audioInput(invalidFormat, this);
+
+    // Check that we are in the default state before calling start
+    QVERIFY2((audioInput.state() == QAudio::StoppedState), "state() was not set to StoppedState before start()");
+    QVERIFY2((audioInput.error() == QAudio::NoError), "error() was not set to QAudio::NoError before start()");
+
+    audioInput.start();
+
+    // Check that error is raised
+    QVERIFY2((audioInput.error() == QAudio::OpenError),"error() was not set to QAudio::OpenError after start()");
+}
+
 void tst_QAudioInput::settings()
 {
     if(available) {
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index 437ef5e..e6d11a6 100644
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -52,6 +52,8 @@
 #define SRCDIR ""
 #endif
 
+Q_DECLARE_METATYPE(QAudioFormat)
+
 class tst_QAudioOutput : public QObject
 {
     Q_OBJECT
@@ -60,6 +62,8 @@ public:
 
 private slots:
     void initTestCase();
+    void invalidFormat_data();
+    void invalidFormat();
     void settings();
     void buffers();
     void notifyInterval();
@@ -74,6 +78,8 @@ private:
 
 void tst_QAudioOutput::initTestCase()
 {
+    qRegisterMetaType<QAudioFormat>();
+
     format.setFrequency(8000);
     format.setChannels(1);
     format.setSampleSize(8);
@@ -92,6 +98,47 @@ void tst_QAudioOutput::initTestCase()
     audio = new QAudioOutput(format, this);
 }
 
+void tst_QAudioOutput::invalidFormat_data()
+{
+    QTest::addColumn<QAudioFormat>("invalidFormat");
+
+    QAudioFormat audioFormat;
+
+    QTest::newRow("Null Format")
+            << audioFormat;
+
+    audioFormat = format;
+    audioFormat.setChannels(0);
+    QTest::newRow("Channel count 0")
+            << audioFormat;
+
+    audioFormat = format;
+    audioFormat.setFrequency(0);
+    QTest::newRow("Sample rate 0")
+            << audioFormat;
+
+    audioFormat = format;
+    audioFormat.setSampleSize(0);
+    QTest::newRow("Sample size 0")
+            << audioFormat;
+}
+
+void tst_QAudioOutput::invalidFormat()
+{
+    QFETCH(QAudioFormat, invalidFormat);
+
+    QAudioOutput audioOutput(invalidFormat, this);
+
+    // Check that we are in the default state before calling start
+    QVERIFY2((audioOutput.state() == QAudio::StoppedState), "state() was not set to StoppedState before start()");
+    QVERIFY2((audioOutput.error() == QAudio::NoError), "error() was not set to QAudio::NoError before start()");
+
+    audioOutput.start();
+
+    // Check that error is raised
+    QVERIFY2((audioOutput.error() == QAudio::OpenError),"error() was not set to QAudio::OpenError after start()");
+}
+
 void tst_QAudioOutput::settings()
 {
     if(available) {
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png b/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png
new file mode 100644
index 0000000..9b401b4
--- /dev/null
+++ b/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png b/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png
new file mode 100644
index 0000000..1c59698
--- /dev/null
+++ b/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index b8e729e..09cf4e2 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -2617,59 +2617,70 @@ void tst_QGraphicsScene::render_data()
     QTest::addColumn<QRectF>("sourceRect");
     QTest::addColumn<Qt::AspectRatioMode>("aspectRatioMode");
     QTest::addColumn<QMatrix>("matrix");
+    QTest::addColumn<QPainterPath>("clip");
+
+    QPainterPath clip_rect;
+    clip_rect.addRect(50, 100, 200, 150);
+
+    QPainterPath clip_ellipse;
+    clip_ellipse.addEllipse(100,50,150,200);
 
     QTest::newRow("all-all-untransformed") << QRectF() << QRectF()
-                                           << Qt::IgnoreAspectRatio << QMatrix();
+                                           << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("all-topleft-untransformed") << QRectF(0, 0, 150, 150)
-                                               << QRectF() << Qt::IgnoreAspectRatio << QMatrix();
+                                               << QRectF() << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("all-topright-untransformed") << QRectF(150, 0, 150, 150)
-                                                << QRectF() << Qt::IgnoreAspectRatio << QMatrix();
+                                                << QRectF() << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("all-bottomleft-untransformed") << QRectF(0, 150, 150, 150)
-                                                  << QRectF() << Qt::IgnoreAspectRatio << QMatrix();
+                                                  << QRectF() << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("all-bottomright-untransformed") << QRectF(150, 150, 150, 150)
-                                                   << QRectF() << Qt::IgnoreAspectRatio << QMatrix();
+                                                   << QRectF() << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("topleft-all-untransformed") << QRectF() << QRectF(-10, -10, 10, 10)
-                                               << Qt::IgnoreAspectRatio << QMatrix();
+                                               << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("topright-all-untransformed") << QRectF() << QRectF(0, -10, 10, 10)
-                                                << Qt::IgnoreAspectRatio << QMatrix();
+                                                << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("bottomleft-all-untransformed") << QRectF() << QRectF(-10, 0, 10, 10)
-                                                  << Qt::IgnoreAspectRatio << QMatrix();
+                                                  << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("bottomright-all-untransformed") << QRectF() << QRectF(0, 0, 10, 10)
-                                                   << Qt::IgnoreAspectRatio << QMatrix();
+                                                   << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("topleft-topleft-untransformed") << QRectF(0, 0, 150, 150) << QRectF(-10, -10, 10, 10)
-                                                   << Qt::IgnoreAspectRatio << QMatrix();
+                                                   << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("topright-topleft-untransformed") << QRectF(150, 0, 150, 150) << QRectF(-10, -10, 10, 10)
-                                                    << Qt::IgnoreAspectRatio << QMatrix();
+                                                    << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("bottomleft-topleft-untransformed") << QRectF(0, 150, 150, 150) << QRectF(-10, -10, 10, 10)
-                                                      << Qt::IgnoreAspectRatio << QMatrix();
+                                                      << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("bottomright-topleft-untransformed") << QRectF(150, 150, 150, 150) << QRectF(-10, -10, 10, 10)
-                                                       << Qt::IgnoreAspectRatio << QMatrix();
+                                                       << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("top-topleft-untransformed") << QRectF(0, 0, 300, 150) << QRectF(-10, -10, 10, 10)
-                                               << Qt::IgnoreAspectRatio << QMatrix();
+                                               << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("bottom-topleft-untransformed") << QRectF(0, 150, 300, 150) << QRectF(-10, -10, 10, 10)
-                                                  << Qt::IgnoreAspectRatio << QMatrix();
+                                                  << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("left-topleft-untransformed") << QRectF(0, 0, 150, 300) << QRectF(-10, -10, 10, 10)
-                                                << Qt::IgnoreAspectRatio << QMatrix();
+                                                << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("right-topleft-untransformed") << QRectF(150, 0, 150, 300) << QRectF(-10, -10, 10, 10)
-                                                 << Qt::IgnoreAspectRatio << QMatrix();
+                                                 << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("top-bottomright-untransformed") << QRectF(0, 0, 300, 150) << QRectF(0, 0, 10, 10)
-                                                   << Qt::IgnoreAspectRatio << QMatrix();
+                                                   << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("bottom-bottomright-untransformed") << QRectF(0, 150, 300, 150) << QRectF(0, 0, 10, 10)
-                                                      << Qt::IgnoreAspectRatio << QMatrix();
+                                                      << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("left-bottomright-untransformed") << QRectF(0, 0, 150, 300) << QRectF(0, 0, 10, 10)
-                                                    << Qt::IgnoreAspectRatio << QMatrix();
+                                                    << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("right-bottomright-untransformed") << QRectF(150, 0, 150, 300) << QRectF(0, 0, 10, 10)
-                                                     << Qt::IgnoreAspectRatio << QMatrix();
+                                                     << Qt::IgnoreAspectRatio << QMatrix() << QPainterPath();
     QTest::newRow("all-all-45-deg-right") << QRectF() << QRectF()
-                                          << Qt::IgnoreAspectRatio << QMatrix().rotate(-45);
+                                          << Qt::IgnoreAspectRatio << QMatrix().rotate(-45) << QPainterPath();
     QTest::newRow("all-all-45-deg-left") << QRectF() << QRectF()
-                                         << Qt::IgnoreAspectRatio << QMatrix().rotate(45);
+                                         << Qt::IgnoreAspectRatio << QMatrix().rotate(45) << QPainterPath();
     QTest::newRow("all-all-scale-2x") << QRectF() << QRectF()
-                                      << Qt::IgnoreAspectRatio << QMatrix().scale(2, 2);
+                                      << Qt::IgnoreAspectRatio << QMatrix().scale(2, 2) << QPainterPath();
     QTest::newRow("all-all-translate-50-0") << QRectF() << QRectF()
-                                            << Qt::IgnoreAspectRatio << QMatrix().translate(50, 0);
+                                            << Qt::IgnoreAspectRatio << QMatrix().translate(50, 0) << QPainterPath();
     QTest::newRow("all-all-translate-0-50") << QRectF() << QRectF()
-                                            << Qt::IgnoreAspectRatio << QMatrix().translate(0, 50);
+                                            << Qt::IgnoreAspectRatio << QMatrix().translate(0, 50) << QPainterPath();
+    QTest::newRow("all-all-untransformed-clip-rect") << QRectF() << QRectF()
+                                           << Qt::IgnoreAspectRatio << QMatrix() << clip_rect;
+    QTest::newRow("all-all-untransformed-clip-ellipse") << QRectF() << QRectF()
+                                           << Qt::IgnoreAspectRatio << QMatrix() << clip_ellipse;
 }
 
 void tst_QGraphicsScene::render()
@@ -2678,6 +2689,7 @@ void tst_QGraphicsScene::render()
     QFETCH(QRectF, sourceRect);
     QFETCH(Qt::AspectRatioMode, aspectRatioMode);
     QFETCH(QMatrix, matrix);
+    QFETCH(QPainterPath, clip);
 
     QPixmap pix(30, 30);
     pix.fill(Qt::blue);
@@ -2703,6 +2715,7 @@ void tst_QGraphicsScene::render()
     painter.drawLine(0, 150, 300, 150);
     painter.drawLine(150, 0, 150, 300);
     painter.setMatrix(matrix);
+    if (!clip.isEmpty()) painter.setClipPath(clip);
     scene.render(&painter, targetRect, sourceRect, aspectRatioMode);
     painter.end();
 
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 7f24ddc..9d6def8 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -101,6 +101,7 @@ private slots:
     void focusWidget_data();
     void focusWidget();
     void focusWidget2();
+    void focusWidget3();
     void focusPolicy_data();
     void focusPolicy();
     void font_data();
@@ -558,6 +559,39 @@ void tst_QGraphicsWidget::focusWidget2()
     QVERIFY(!widget->focusWidget());
 }
 
+class FocusWatchWidget : public QGraphicsWidget
+{
+public:
+    FocusWatchWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent) { gotFocusInCount = 0; gotFocusOutCount = 0; }
+    int gotFocusInCount, gotFocusOutCount;
+protected:
+    void focusInEvent(QFocusEvent *fe) { gotFocusInCount++; QGraphicsWidget::focusInEvent(fe); }
+    void focusOutEvent(QFocusEvent *fe) { gotFocusOutCount++; QGraphicsWidget::focusOutEvent(fe); }
+};
+
+void tst_QGraphicsWidget::focusWidget3()
+{
+    QGraphicsScene scene;
+    QEvent windowActivate(QEvent::WindowActivate);
+    qApp->sendEvent(&scene, &windowActivate);
+
+    QGraphicsWidget *widget = new QGraphicsWidget;
+    FocusWatchWidget *subWidget = new FocusWatchWidget(widget);
+    subWidget->setFocusPolicy(Qt::StrongFocus);
+
+    scene.addItem(widget);
+    widget->show();
+
+    QTRY_VERIFY(!widget->hasFocus());
+    QTRY_VERIFY(!subWidget->hasFocus());
+
+    subWidget->setFocus();
+    QCOMPARE(subWidget->gotFocusInCount, 1);
+    QCOMPARE(subWidget->gotFocusOutCount, 0);
+    widget->hide();
+    QCOMPARE(subWidget->gotFocusOutCount, 1);
+}
+
 Q_DECLARE_METATYPE(Qt::FocusPolicy)
 void tst_QGraphicsWidget::focusPolicy_data()
 {
@@ -3350,6 +3384,7 @@ void tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem()
 
     view.show();
     QTest::qWaitForWindowShown(&view);
+    QApplication::processEvents();
 
 
     GreenWidget *sub =  new GreenWidget;