Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2

6 files changed, 118 insertions, 42 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7ba6243..791d23c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -11,7 +11,6 @@ TEMPLATE = subdirs
            maketestselftest \
            moc \
            uic \
-           uic3 \
            guiapplauncher \
            #atwrapper \     # These tests need significant updating,
            #uiloader \      # they have hardcoded machine names etc.
@@ -69,6 +68,9 @@ Q3SUBDIRS += \
            q3uridrag \
            q3widgetstack
 
+!cross_compile:Q3SUBDIRS += \
+           uic3
+
 SUBDIRS += \
 #           exceptionsafety_objects \ shouldn't enable it
            languagechange \
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp
index 5c72c7a..07fdbc3 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/qbytearray/tst_qbytearray.cpp
@@ -111,6 +111,7 @@ private slots:
     void remove();
     void replace_data();
     void replace();
+    void replaceWithSpecifiedLength();
     void indexOf_data();
     void indexOf();
     void lastIndexOf_data();
@@ -840,6 +841,18 @@ void tst_QByteArray::replace()
     QCOMPARE(str2.replace(pos, len, after.data()), expected);
 }
 
+void tst_QByteArray::replaceWithSpecifiedLength()
+{
+    const char after[] = "zxc\0vbnmqwert";
+    int lenAfter = 6;
+    QByteArray ba("abcdefghjk");
+    ba.replace(0,2,after,lenAfter);
+
+    const char _expected[] = "zxc\0vbcdefghjk";
+    QByteArray expected(_expected,sizeof(_expected)-1);
+    QCOMPARE(ba,expected);
+}
+
 void tst_QByteArray::indexOf_data()
 {
     QTest::addColumn<QByteArray>("haystack");
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 1bf7850..280c6c8 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -978,6 +978,47 @@ void tst_QGL::glWidgetWithAlpha()
     delete w;
 }
 
+
+bool qt_opengl_draw_test_pattern(QPainter* painter, int width, int height)
+{
+    QPainterPath intersectingPath;
+    intersectingPath.moveTo(0, 0);
+    intersectingPath.lineTo(100, 0);
+    intersectingPath.lineTo(0, 100);
+    intersectingPath.lineTo(100, 100);
+    intersectingPath.closeSubpath();
+
+    QPainterPath trianglePath;
+    trianglePath.moveTo(50, 0);
+    trianglePath.lineTo(100, 100);
+    trianglePath.lineTo(0, 100);
+    trianglePath.closeSubpath();
+
+    painter->setTransform(QTransform()); // reset xform
+    painter->fillRect(-1, -1, width+2, height+2, Qt::red); // Background
+    painter->translate(14, 14);
+    painter->fillPath(intersectingPath, Qt::blue); // Test stencil buffer works
+    painter->translate(128, 0);
+    painter->setClipPath(trianglePath); // Test depth buffer works
+    painter->setTransform(QTransform()); // reset xform ready for fill
+    painter->fillRect(-1, -1, width+2, height+2, Qt::green);
+}
+
+void qt_opengl_check_test_pattern(const QImage& img)
+{
+    // As we're doing more than trivial painting, we can't just compare to
+    // an image rendered with raster. Instead, we sample at well-defined
+    // test-points:
+    QFUZZY_COMPARE_PIXELS(img.pixel(39, 64), QColor(Qt::red).rgb());
+    QFUZZY_COMPARE_PIXELS(img.pixel(89, 64), QColor(Qt::red).rgb());
+    QFUZZY_COMPARE_PIXELS(img.pixel(64, 39), QColor(Qt::blue).rgb());
+    QFUZZY_COMPARE_PIXELS(img.pixel(64, 89), QColor(Qt::blue).rgb());
+
+    QFUZZY_COMPARE_PIXELS(img.pixel(167, 39), QColor(Qt::red).rgb());
+    QFUZZY_COMPARE_PIXELS(img.pixel(217, 39), QColor(Qt::red).rgb());
+    QFUZZY_COMPARE_PIXELS(img.pixel(192, 64), QColor(Qt::green).rgb());
+}
+
 class GLWidget : public QGLWidget
 {
 public:
@@ -992,9 +1033,7 @@ public:
         QPaintEngine* pe = p.paintEngine();
         engineType = pe->type();
 
-        // This test only ensures it's possible to paint onto a QGLWidget. Full
-        // paint engine feature testing is way out of scope!
-        p.fillRect(-1, -1, width()+2, height()+2, Qt::red);
+        qt_opengl_draw_test_pattern(&p, width(), height());
 
         // No p.end() or swap buffers, should be done automatically
     }
@@ -1007,7 +1046,7 @@ void tst_QGL::glWidgetRendering()
 #ifdef Q_WS_QWS
     w.setWindowFlags(Qt::FramelessWindowHint);
 #endif
-    w.setGeometry(100, 100, 200, 200);
+    w.resize(256, 128);
     w.show();
 
 #ifdef Q_WS_X11
@@ -1018,11 +1057,8 @@ void tst_QGL::glWidgetRendering()
     QVERIFY(w.beginOk);
     QVERIFY(w.engineType == QPaintEngine::OpenGL || w.engineType == QPaintEngine::OpenGL2);
 
-    QImage fb = w.grabFrameBuffer(false).convertToFormat(QImage::Format_RGB32);
-    QImage reference(fb.size(), QImage::Format_RGB32);
-    reference.fill(0xffff0000);
-
-    QFUZZY_COMPARE_IMAGES(fb, reference);
+    QImage fb = w.grabFrameBuffer(false);
+    qt_opengl_check_test_pattern(fb);
 }
 
 void tst_QGL::glFBOSimpleRendering()
@@ -1075,46 +1111,23 @@ void tst_QGL::glFBORendering()
     // Don't complicate things by using NPOT:
     QGLFramebufferObject *fbo = new QGLFramebufferObject(256, 128, fboFormat);
 
+    if (fbo->attachment() != QGLFramebufferObject::CombinedDepthStencil) {
+        delete fbo;
+        QSKIP("FBOs missing combined depth~stencil support", SkipSingle);
+    }
+
     QPainter fboPainter;
     bool painterBegun = fboPainter.begin(fbo);
     QVERIFY(painterBegun);
 
-    QPainterPath intersectingPath;
-    intersectingPath.moveTo(0, 0);
-    intersectingPath.lineTo(100, 0);
-    intersectingPath.lineTo(0, 100);
-    intersectingPath.lineTo(100, 100);
-    intersectingPath.closeSubpath();
-
-    QPainterPath trianglePath;
-    trianglePath.moveTo(50, 0);
-    trianglePath.lineTo(100, 100);
-    trianglePath.lineTo(0, 100);
-    trianglePath.closeSubpath();
+    qt_opengl_draw_test_pattern(&fboPainter, fbo->width(), fbo->height());
 
-    fboPainter.fillRect(0, 0, fbo->width(), fbo->height(), Qt::red); // Background
-    fboPainter.translate(14, 14);
-    fboPainter.fillPath(intersectingPath, Qt::blue); // Test stencil buffer works
-    fboPainter.translate(128, 0);
-    fboPainter.setClipPath(trianglePath); // Test depth buffer works
-    fboPainter.setTransform(QTransform()); // reset xform
-    fboPainter.fillRect(0, 0, fbo->width(), fbo->height(), Qt::green);
     fboPainter.end();
 
     QImage fb = fbo->toImage().convertToFormat(QImage::Format_RGB32);
     delete fbo;
 
-    // As we're doing more than trivial painting, we can't just compare to
-    // an image rendered with raster. Instead, we sample at well-defined
-    // test-points:
-    QFUZZY_COMPARE_PIXELS(fb.pixel(39, 64), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb.pixel(89, 64), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb.pixel(64, 39), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(fb.pixel(64, 89), QColor(Qt::blue).rgb());
-
-    QFUZZY_COMPARE_PIXELS(fb.pixel(167, 39), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb.pixel(217, 39), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb.pixel(192, 64), QColor(Qt::green).rgb());
+    qt_opengl_check_test_pattern(fb);
 }
 
 
@@ -1137,6 +1150,16 @@ void tst_QGL::multipleFBOInterleavedRendering()
     QGLFramebufferObject *fbo2 = new QGLFramebufferObject(256, 128, fboFormat);
     QGLFramebufferObject *fbo3 = new QGLFramebufferObject(256, 128, fboFormat);
 
+    if ( (fbo1->attachment() != QGLFramebufferObject::CombinedDepthStencil) ||
+         (fbo2->attachment() != QGLFramebufferObject::CombinedDepthStencil) ||
+         (fbo3->attachment() != QGLFramebufferObject::CombinedDepthStencil)    )
+    {
+        delete fbo1;
+        delete fbo2;
+        delete fbo3;
+        QSKIP("FBOs missing combined depth~stencil support", SkipSingle);
+    }
+
     QPainter fbo1Painter;
     QPainter fbo2Painter;
     QPainter fbo3Painter;
@@ -1242,7 +1265,7 @@ protected:
         QPainter widgetPainter;
         widgetPainterBeginOk = widgetPainter.begin(this);
         QGLFramebufferObjectFormat fboFormat;
-        fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
+        fboFormat.setAttachment(QGLFramebufferObject::NoAttachment);
         QGLFramebufferObject *fbo = new QGLFramebufferObject(128, 128, fboFormat);
 
         QPainter fboPainter;
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
index d020d8f..66cfeb7 100644
--- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -44,6 +44,7 @@
 #include <QtCore/qpropertyanimation.h>
 #include <QtCore/qvariantanimation.h>
 #include <QtGui/qwidget.h>
+#include "../../shared/util.h"
 
 //TESTED_CLASS=QPropertyAnimation
 //TESTED_FILES=
@@ -1095,7 +1096,7 @@ void tst_QPropertyAnimation::valueChanged()
 
     QTest::qWait(anim.duration() + 100);
 
-    QCOMPARE(anim.state(), QAbstractAnimation::Stopped);
+    QTRY_COMPARE(anim.state(), QAbstractAnimation::Stopped);
     QCOMPARE(anim.currentTime(), anim.duration());
 
     //let's check that the values go forward
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index e638e287..12686bb 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -191,6 +191,7 @@ private slots:
     void increaseReadBufferSize();
     void taskQtBug5799ConnectionErrorWaitForConnected();
     void taskQtBug5799ConnectionErrorEventLoop();
+    void taskQtBug7054TimeoutErrorResetting();
 
     void invalidProxy_data();
     void invalidProxy();
@@ -2236,6 +2237,30 @@ void tst_QTcpSocket::taskQtBug5799ConnectionErrorEventLoop()
              QString("Could not reach server: %1").arg(socket.errorString()).toLocal8Bit());
 }
 
+void tst_QTcpSocket::taskQtBug7054TimeoutErrorResetting()
+{
+    QTcpSocket *socket = newSocket();
+
+    socket->connectToHost(QtNetworkSettings::serverName(), 443);
+    QVERIFY(socket->waitForConnected(5*1000));
+    QVERIFY(socket->error() == QAbstractSocket::UnknownSocketError);
+
+    // We connected to the HTTPS port. Wait two seconds to receive data. We will receive
+    // nothing because we would need to start the SSL handshake
+    QVERIFY(!socket->waitForReadyRead(2*1000));
+    QVERIFY(socket->error() == QAbstractSocket::SocketTimeoutError);
+
+    // Now write some crap to make the server disconnect us. 4 lines are enough.
+    socket->write("a\r\nb\r\nc\r\nd\r\n");
+    socket->waitForBytesWritten(2*1000);
+
+    // we try to waitForReadyRead another time, but this time instead of a timeout we
+    // should get a better error since the server disconnected us
+    QVERIFY(!socket->waitForReadyRead(2*1000));
+    // It must NOT be the SocketTimeoutError that had been set before
+    QVERIFY(socket->error() == QAbstractSocket::RemoteHostClosedError);
+}
+
 void tst_QTcpSocket::invalidProxy_data()
 {
     QTest::addColumn<int>("type");
diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp
index 70abc43..28970eb 100644
--- a/tests/auto/symbols/tst_symbols.cpp
+++ b/tests/auto/symbols/tst_symbols.cpp
@@ -211,6 +211,10 @@ void tst_Symbols::prefix()
                    << "winfnt_driver_class"
                    << "pshinter_module_class"
                    << "psnames_module_class"
+                   // C symbols from Qt
+                   << "qt_addObject"
+                   << "qt_removeObject"
+                   << "qt_startup_hook"
                    ;
 
     QHash<QString,QStringList> excusedPrefixes;
@@ -278,6 +282,10 @@ void tst_Symbols::prefix()
                       << "cti"  // ctiTrampoline and ctiVMThrowTrampoline from the JIT
 #ifdef QT_NAMESPACE
                       << "QWeb" // Webkit is only 'namespace aware'
+                      << "qWeb"
+                      << "qt"
+                      << "QGraphicsWebView"
+                      << "operator"
 #endif
         ;
 
@@ -330,6 +338,8 @@ void tst_Symbols::prefix()
                 symbol = symbol.mid(symbol.indexOf(' ') + 1);
             }
 
+            if (symbol.mid(symbol.indexOf(' ')+1).startsWith("std::"))
+                continue;
             if (symbol.startsWith("_") || symbol.startsWith("std::"))
                 continue;
             if (symbol.startsWith("vtable ") || symbol.startsWith("VTT for ") ||
@@ -341,6 +351,8 @@ void tst_Symbols::prefix()
                 continue;
             if (symbol.startsWith(ns + "operator"))
                 continue;
+            if (symbol.startsWith("operator new") || symbol.startsWith("operator delete"))
+                continue;
             if (symbol.startsWith("guard variable for "))
                 continue;
             if (symbol.contains("(" + ns + "QTextStream"))