Merge remote-tracking branch 'qt/4.8'

21 files changed, 386 insertions, 139 deletions

diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp
index 48456e3..6241f60 100644
--- a/tests/arthur/baselineserver/src/baselineserver.cpp
+++ b/tests/arthur/baselineserver/src/baselineserver.cpp
@@ -172,27 +172,31 @@ const char *BaselineHandler::logtime()
 
 bool BaselineHandler::establishConnection()
 {
-    if (!proto.acceptConnection(&plat)) {
+    if (!proto.acceptConnection(&clientInfo)) {
         qWarning() << runId << logtime() << "Accepting new connection from" << proto.socket.peerAddress().toString() << "failed." << proto.errorMessage();
         proto.sendBlock(BaselineProtocol::Abort, proto.errorMessage().toLatin1());  // In case the client can hear us, tell it what's wrong.
         proto.socket.disconnectFromHost();
         return false;
     }
     QString logMsg;
-    foreach (QString key, plat.keys()) {
+    foreach (QString key, clientInfo.keys()) {
         if (key != PI_HostName && key != PI_HostAddress)
-            logMsg += key + QLS(": '") + plat.value(key) + QLS("', ");
+            logMsg += key + QLS(": '") + clientInfo.value(key) + QLS("', ");
     }
-    qDebug() << runId << logtime() << "Connection established with" << plat.value(PI_HostName)
-             << "[" << qPrintable(plat.value(PI_HostAddress)) << "]" << logMsg;
+    qDebug() << runId << logtime() << "Connection established with" << clientInfo.value(PI_HostName)
+             << "[" << qPrintable(clientInfo.value(PI_HostAddress)) << "]" << logMsg
+             << "Overrides:" << clientInfo.overrides() << "AdHoc-Run:" << clientInfo.isAdHocRun();
+
+    //### Temporarily override the client setting, for client compatibility:
+    if (!clientInfo.isAdHocRun())
+        clientInfo.setAdHocRun(clientInfo.value(PI_PulseGitBranch).isEmpty() && clientInfo.value(PI_PulseTestrBranch).isEmpty());
 
     settings->beginGroup("ClientFilters");
-    if (!settings->childKeys().isEmpty() && !plat.value(PI_PulseGitBranch).isEmpty()) {  // i.e. not adhoc client
-        // Abort if client does not match the filters
+    if (!clientInfo.isAdHocRun()) {         // for CI runs, allow filtering of clients. TBD: different filters (settings file) per testCase
         foreach (QString filterKey, settings->childKeys()) {
             QString filter = settings->value(filterKey).toString();
-            QString platVal = plat.value(filterKey);
-            if (filter.isEmpty() || platVal.isEmpty())
+            QString platVal = clientInfo.value(filterKey);
+            if (filter.isEmpty())
                 continue;  // tbd: add a syntax for specifying a "value-must-be-present" filter
             if (!platVal.contains(filter)) {
                 qDebug() << runId << logtime() << "Did not pass client filter on" << filterKey << "; disconnecting.";
@@ -206,7 +210,7 @@ bool BaselineHandler::establishConnection()
 
     proto.sendBlock(BaselineProtocol::Ack, QByteArray());
 
-    report.init(this, runId, plat);
+    report.init(this, runId, clientInfo);
     return true;
 }
 
@@ -297,6 +301,12 @@ void BaselineHandler::storeImage(const QByteArray &itemBlock, bool isBaseline)
     ImageItem item;
     ds >> item;
 
+    if (isBaseline && !clientInfo.overrides().isEmpty()) {
+        qDebug() << runId << logtime() << "Received baseline from client with override info, ignoring. Item:" << item.itemName;
+        proto.sendBlock(BaselineProtocol::UnknownError, "New baselines not accepted from client with override info.");
+        return;
+    }
+
     QString prefix = pathForItem(item, isBaseline);
     qDebug() << runId << logtime() << "Received" << (isBaseline ? "baseline" : "mismatched") << "image for:" << item.itemName << "Storing in" << prefix;
 
@@ -313,7 +323,7 @@ void BaselineHandler::storeImage(const QByteArray &itemBlock, bool isBaseline)
         cwd.mkpath(dir);
     item.image.save(prefix + QLS(FileFormat), FileFormat);
 
-    PlatformInfo itemData = plat;
+    PlatformInfo itemData = clientInfo;
     itemData.insert(PI_ImageChecksum, QString::number(item.imageChecksums.at(0), 16));  //# Only the first is stored. TBD: get rid of list
     itemData.insert(PI_RunId, runId);
     itemData.insert(PI_CreationDate, QDateTime::currentDateTime().toString());
@@ -366,17 +376,16 @@ void BaselineHandler::receiveDisconnect()
 }
 
 
-void BaselineHandler::mapPlatformInfo() const
+PlatformInfo BaselineHandler::mapPlatformInfo(const PlatformInfo& orig) const
 {
-    mapped = plat;
+    PlatformInfo mapped = orig;
 
     // Map hostname
-    QString host = plat.value(PI_HostName).section(QLC('.'), 0, 0);  // Filter away domain, if any
+    QString host = orig.value(PI_HostName).section(QLC('.'), 0, 0);  // Filter away domain, if any
     if (host.isEmpty() || host == QLS("localhost")) {
-        host = plat.value(PI_HostAddress);
+        host = orig.value(PI_HostAddress);
     } else {
-        if (!plat.value(PI_PulseGitBranch).isEmpty()) {
-            // i.e. pulse run, so remove index postfix typical of vm hostnames
+        if (!orig.isAdHocRun()) {    // i.e. CI system run, so remove index postfix typical of vm hostnames
             host.remove(QRegExp(QLS("\\d+$")));
             if (host.endsWith(QLC('-')))
                 host.chop(1);
@@ -387,18 +396,28 @@ void BaselineHandler::mapPlatformInfo() const
     mapped.insert(PI_HostName, host);
 
     // Map qmakespec
-    QString mkspec = plat.value(PI_QMakeSpec);
+    QString mkspec = orig.value(PI_QMakeSpec);
     mapped.insert(PI_QMakeSpec, mkspec.replace(QLC('/'), QLC('_')));
 
     // Map Qt version
-    QString ver = plat.value(PI_QtVersion);
+    QString ver = orig.value(PI_QtVersion);
     mapped.insert(PI_QtVersion, ver.prepend(QLS("Qt-")));
+
+    return mapped;
 }
 
+
 QString BaselineHandler::pathForItem(const ImageItem &item, bool isBaseline, bool absolute) const
 {
-    if (mapped.isEmpty())
-        mapPlatformInfo();
+    if (mappedClientInfo.isEmpty()) {
+        mappedClientInfo = mapPlatformInfo(clientInfo);
+        PlatformInfo oraw = clientInfo;
+        for (int i = 0; i < clientInfo.overrides().size()-1; i+=2)
+            oraw.insert(clientInfo.overrides().at(i), clientInfo.overrides().at(i+1));
+        overriddenMappedClientInfo = mapPlatformInfo(oraw);
+    }
+
+    const PlatformInfo& mapped = isBaseline ? overriddenMappedClientInfo : mappedClientInfo;
 
     QString itemName = item.itemName.simplified();
     itemName.replace(QLC(' '), QLC('_'));
@@ -512,13 +531,13 @@ void BaselineHandler::testPathMapping()
     item.imageChecksums << 0x0123456789abcdefULL;
     item.itemChecksum = 0x0123;
 
-    plat.insert(PI_QtVersion, QLS("4.8.0"));
-    plat.insert(PI_BuildKey, QLS("(nobuildkey)"));
-    plat.insert(PI_QMakeSpec, QLS("linux-g++"));
-    plat.insert(PI_PulseGitBranch, QLS("somebranch"));
+    clientInfo.insert(PI_QtVersion, QLS("4.8.0"));
+    clientInfo.insert(PI_BuildKey, QLS("(nobuildkey)"));
+    clientInfo.insert(PI_QMakeSpec, QLS("linux-g++"));
+    clientInfo.insert(PI_PulseGitBranch, QLS("somebranch"));
     foreach(const QString& host, hosts) {
-        mapped.clear();
-        plat.insert(PI_HostName, host);
+        mappedClientInfo.clear();
+        clientInfo.insert(PI_HostName, host);
         qDebug() << "Baseline from" << host << "->" << pathForItem(item, true);
         qDebug() << "Mismatch from" << host << "->" << pathForItem(item, false);
     }
diff --git a/tests/arthur/baselineserver/src/baselineserver.h b/tests/arthur/baselineserver/src/baselineserver.h
index d73bb97..333d9ed 100644
--- a/tests/arthur/baselineserver/src/baselineserver.h
+++ b/tests/arthur/baselineserver/src/baselineserver.h
@@ -125,13 +125,14 @@ private:
     void storeImage(const QByteArray &itemBlock, bool isBaseline);
     void storeItemMetadata(const PlatformInfo &metadata, const QString &path);
     PlatformInfo fetchItemMetadata(const QString &path);
-    void mapPlatformInfo() const;
+    PlatformInfo mapPlatformInfo(const PlatformInfo& orig) const;
     const char *logtime();
     QString computeMismatchScore(const QImage& baseline, const QImage& rendered);
 
     BaselineProtocol proto;
-    PlatformInfo plat;
-    mutable PlatformInfo mapped;
+    PlatformInfo clientInfo;
+    mutable PlatformInfo mappedClientInfo;
+    mutable PlatformInfo overriddenMappedClientInfo;
     QString runId;
     bool connectionEstablished;
     Report report;
diff --git a/tests/arthur/baselineserver/src/report.cpp b/tests/arthur/baselineserver/src/report.cpp
index 7c2d6ac..16f061c 100644
--- a/tests/arthur/baselineserver/src/report.cpp
+++ b/tests/arthur/baselineserver/src/report.cpp
@@ -66,12 +66,13 @@ void Report::init(const BaselineHandler *h, const QString &r, const PlatformInfo
     runId = r;
     plat = p;
     rootDir = BaselineServer::storagePath() + QLC('/');
-    reportDir = plat.value(PI_TestCase) + QLC('/') + (plat.value(PI_PulseGitBranch).isEmpty() ? QLS("reports/adhoc/") : QLS("reports/pulse/"));
+    reportDir = plat.value(PI_TestCase) + QLC('/') + (plat.isAdHocRun() ? QLS("reports/adhoc/") : QLS("reports/pulse/"));
     QString dir = rootDir + reportDir;
     QDir cwd;
     if (!cwd.exists(dir))
         cwd.mkpath(dir);
     path = reportDir + QLS("Report_") + runId + QLS(".html");
+    hasOverride = !plat.overrides().isEmpty();
 }
 
 void Report::addItems(const ImageItemList &items)
@@ -141,11 +142,19 @@ void Report::writeHeader()
         << "<p>Note: This is a <i>static</i> page, generated at " << QDateTime::currentDateTime().toString()
         << " for the test run with id " << runId << "</p>\n"
         << "<p>Summary: <b><span style=\"color:red\">" << numMismatches << " of " << numItems << "</b></span> items reported mismatching</p>\n\n";
-    out << "<h3>Platform Info:</h3>\n"
+    out << "<h3>Testing Client Platform Info:</h3>\n"
         << "<table>\n";
     foreach (QString key, plat.keys())
-        out << "<tr><td>" << key << "</td><td>" << plat.value(key) << "</td></tr>\n";
+        out << "<tr><td>" << key << ":</td><td>" << plat.value(key) << "</td></tr>\n";
     out << "</table>\n\n";
+    if (hasOverride) {
+        out << "<span style=\"color:red\"><h4>Note! Platform Override Info:</h4></span>\n"
+            << "<p>The client's output has been compared to baselines created on a different platform. Differences:</p>\n"
+            << "<table>\n";
+        for (int i = 0; i < plat.overrides().size()-1; i+=2)
+            out << "<tr><td>" << plat.overrides().at(i) << ":</td><td>" << plat.overrides().at(i+1) << "</td></tr>\n";
+        out << "</table>\n\n";
+    }
 }
 
 
@@ -158,10 +167,12 @@ void Report::writeFunctionResults(const ImageItemList &list)
 
 
     out << "\n<p>&nbsp;</p><h3>Test function: " << testFunction << "</h3>\n";
-    out << "<p><a href=\"/cgi-bin/server.cgi?cmd=clearAllBaselines&context=" << ctx << "&url=" << pageUrl
-        << "\"><b>Clear all baselines</b></a> for this testfunction (They will be recreated by the next run)</p>\n";
-    out << "<p><a href=\"/cgi-bin/server.cgi?cmd=updateAllBaselines&context=" << ctx << "&mismatchContext=" << misCtx << "&url=" << pageUrl
-        << "\"><b>Let these mismatching images be the new baselines</b></a> for this testfunction</p>\n\n";
+    if (!hasOverride) {
+        out << "<p><a href=\"/cgi-bin/server.cgi?cmd=clearAllBaselines&context=" << ctx << "&url=" << pageUrl
+            << "\"><b>Clear all baselines</b></a> for this testfunction (They will be recreated by the next run)</p>\n";
+        out << "<p><a href=\"/cgi-bin/server.cgi?cmd=updateAllBaselines&context=" << ctx << "&mismatchContext=" << misCtx << "&url=" << pageUrl
+            << "\"><b>Let these mismatching images be the new baselines</b></a> for this testfunction</p>\n\n";
+    }
 
     out << "<table border=\"2\">\n"
            "<tr>\n"
@@ -192,10 +203,12 @@ void Report::writeFunctionResults(const ImageItemList &list)
                 out << "Baseline not found/regenerated";
                 break;
             case ImageItem::IgnoreItem:
-                out << "<span style=\"background-color:yellow\">Blacklisted</span> "
-                    << "<a href=\"/cgi-bin/server.cgi?cmd=whitelist&context=" << ctx
-                    << "&itemId=" << item.itemName << "&url=" << pageUrl
-                    << "\">Whitelist this item</a>";
+                out << "<span style=\"background-color:yellow\">Blacklisted</span> ";
+                if (!hasOverride) {
+                    out << "<a href=\"/cgi-bin/server.cgi?cmd=whitelist&context=" << ctx
+                        << "&itemId=" << item.itemName << "&url=" << pageUrl
+                        << "\">Whitelist this item</a>";
+                }
                 break;
             case ImageItem::Ok:
                 out << "<span style=\"color:green\"><small>No mismatch reported</small></span>";
@@ -224,12 +237,14 @@ void Report::writeItem(const QString &baseline, const QString &rendered, const I
 
     out << "<td align=center>\n"
         << "<p><span style=\"color:red\">Mismatch reported</span></p>\n"
-        << "<p><a href=\"/" << metadata << "\">Baseline Info</a>\n"
-        << "<p><a href=\"/cgi-bin/server.cgi?cmd=updateSingleBaseline&context=" << ctx << "&mismatchContext=" << misCtx
-        << "&itemFile=" << itemFile << "&url=" << pageUrl << "\">Let this be the new baseline</a></p>\n"
-        << "<p><a href=\"/cgi-bin/server.cgi?cmd=blacklist&context=" << ctx
-        << "&itemId=" << item.itemName << "&url=" << pageUrl << "\">Blacklist this item</a></p>\n"
-        << "<p><a href=\"/cgi-bin/server.cgi?cmd=view&baseline=" << baseline << "&rendered=" << rendered
+        << "<p><a href=\"/" << metadata << "\">Baseline Info</a>\n";
+    if (!hasOverride) {
+        out << "<p><a href=\"/cgi-bin/server.cgi?cmd=updateSingleBaseline&context=" << ctx << "&mismatchContext=" << misCtx
+            << "&itemFile=" << itemFile << "&url=" << pageUrl << "\">Let this be the new baseline</a></p>\n"
+            << "<p><a href=\"/cgi-bin/server.cgi?cmd=blacklist&context=" << ctx
+            << "&itemId=" << item.itemName << "&url=" << pageUrl << "\">Blacklist this item</a></p>\n";
+    }
+    out << "<p><a href=\"/cgi-bin/server.cgi?cmd=view&baseline=" << baseline << "&rendered=" << rendered
         << "&compared=" << compared << "&url=" << pageUrl << "\">Inspect</a></p>\n"
         << "</td>\n";
 }
diff --git a/tests/arthur/baselineserver/src/report.h b/tests/arthur/baselineserver/src/report.h
index d21102d..610497c 100644
--- a/tests/arthur/baselineserver/src/report.h
+++ b/tests/arthur/baselineserver/src/report.h
@@ -86,6 +86,7 @@ private:
     int numItems;
     int numMismatches;
     QTextStream out;
+    bool hasOverride;
 };
 
 #endif // REPORT_H
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp
index 0fe3aa2..630ca88 100644
--- a/tests/arthur/common/baselineprotocol.cpp
+++ b/tests/arthur/common/baselineprotocol.cpp
@@ -83,7 +83,7 @@ void BaselineProtocol::sysSleep(int ms)
 }
 
 PlatformInfo::PlatformInfo()
-    : QMap<QString, QString>(), replaceDefault(false)
+    : QMap<QString, QString>(), adHoc(true)
 {
 }
 
@@ -134,11 +134,15 @@ PlatformInfo PlatformInfo::localHostInfo()
         pi.insert(PI_GitCommit, QLS("Unknown"));
 
     QByteArray gb = qgetenv("PULSE_GIT_BRANCH");
-    if (!gb.isEmpty())
+    if (!gb.isEmpty()) {
         pi.insert(PI_PulseGitBranch, QString::fromLatin1(gb));
+        pi.setAdHocRun(false);
+    }
     QByteArray tb = qgetenv("PULSE_TESTR_BRANCH");
-    if (!tb.isEmpty())
+    if (!tb.isEmpty()) {
         pi.insert(PI_PulseTestrBranch, QString::fromLatin1(tb));
+        pi.setAdHocRun(false);
+    }
 
     return pi;
 }
@@ -147,43 +151,49 @@ PlatformInfo PlatformInfo::localHostInfo()
 PlatformInfo::PlatformInfo(const PlatformInfo &other)
     : QMap<QString, QString>(other)
 {
-    sigKeys = other.sigKeys;
-    replaceDefault = other.replaceDefault;
+    orides = other.orides;
+    adHoc = other.adHoc;
 }
 
 
 PlatformInfo &PlatformInfo::operator=(const PlatformInfo &other)
 {
     QMap<QString, QString>::operator=(other);
-    sigKeys = other.sigKeys;
-    replaceDefault = other.replaceDefault;
+    orides = other.orides;
+    adHoc = other.adHoc;
     return *this;
 }
 
 
-void PlatformInfo::addSignificantKeys(const QStringList &keys, bool replaceDefaultKeys)
+void PlatformInfo::addOverride(const QString& key, const QString& value)
+{
+    orides.append(key);
+    orides.append(value);
+}
+
+
+QStringList PlatformInfo::overrides() const
 {
-    sigKeys = keys;
-    replaceDefault = replaceDefaultKeys;
+    return orides;
 }
 
 
-QStringList PlatformInfo::addedKeys() const
+void PlatformInfo::setAdHocRun(bool isAdHoc)
 {
-    return sigKeys;
+    adHoc = isAdHoc;
 }
 
 
-bool PlatformInfo::addedKeysReplaceDefault() const
+bool PlatformInfo::isAdHocRun() const
 {
-    return replaceDefault;
+    return adHoc;
 }
 
 
 QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi)
 {
     stream << static_cast<const QMap<QString, QString>&>(pi);
-    stream << pi.sigKeys << pi.replaceDefault;
+    stream << pi.orides << pi.adHoc;
     return stream;
 }
 
@@ -191,7 +201,7 @@ QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi)
 QDataStream & operator>> (QDataStream &stream, PlatformInfo &pi)
 {
     stream >> static_cast<QMap<QString, QString>&>(pi);
-    stream >> pi.sigKeys >> pi.replaceDefault;
+    stream >> pi.orides >> pi.adHoc;
     return stream;
 }
 
@@ -346,7 +356,7 @@ BaselineProtocol::~BaselineProtocol()
 }
 
 
-bool BaselineProtocol::connect(const QString &testCase, bool *dryrun)
+bool BaselineProtocol::connect(const QString &testCase, bool *dryrun, const PlatformInfo& clientInfo)
 {
     errMsg.clear();
     QByteArray serverName(qgetenv("QT_LANCELOT_SERVER"));
@@ -362,7 +372,7 @@ bool BaselineProtocol::connect(const QString &testCase, bool *dryrun)
         }
     }
 
-    PlatformInfo pi = PlatformInfo::localHostInfo();
+    PlatformInfo pi = clientInfo.isEmpty() ? PlatformInfo::localHostInfo() : clientInfo;
     pi.insert(PI_TestCase, testCase);
     QByteArray block;
     QDataStream ds(&block, QIODevice::ReadWrite);
diff --git a/tests/arthur/common/baselineprotocol.h b/tests/arthur/common/baselineprotocol.h
index 2d09e68..0b08e44 100644
--- a/tests/arthur/common/baselineprotocol.h
+++ b/tests/arthur/common/baselineprotocol.h
@@ -78,13 +78,14 @@ public:
 
     static PlatformInfo localHostInfo();
 
-    void addSignificantKeys(const QStringList& keys, bool replaceDefaultKeys=false);
-    QStringList addedKeys() const;
-    bool addedKeysReplaceDefault() const;
+    void addOverride(const QString& key, const QString& value);
+    QStringList overrides() const;
+    bool isAdHocRun() const;
+    void setAdHocRun(bool isAdHoc);
 
 private:
-    QStringList sigKeys;
-    bool replaceDefault;
+    QStringList orides;
+    bool adHoc;
     friend QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi);
     friend QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi);
 };
@@ -165,7 +166,7 @@ public:
     // For client:
 
     // For advanced client:
-    bool connect(const QString &testCase, bool *dryrun = 0);
+    bool connect(const QString &testCase, bool *dryrun = 0, const PlatformInfo& clientInfo = PlatformInfo());
     bool requestBaselineChecksums(const QString &testFunction, ImageItemList *itemList);
     bool submitNewBaseline(const ImageItem &item, QByteArray *serverMsg);
     bool submitMismatch(const ImageItem &item, QByteArray *serverMsg);
diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index 298c699..f54d942 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -2454,7 +2454,11 @@ void PaintCommands::command_gradient_setRadialExtended(QRegExp re)
                "focal radius=%.2f, spread=%d\n",
                cx, cy, rad, fx, fy, frad, m_gradientSpread);
 
+#if QT_VERSION >= 0x040800
     QRadialGradient rg(QPointF(cx, cy), rad, QPointF(fx, fy), frad);
+#else
+    QRadialGradient rg(QPointF(cx, cy), rad, QPointF(fx, fy));
+#endif
     rg.setStops(m_gradientStops);
     rg.setSpread(m_gradientSpread);
     rg.setCoordinateMode(m_gradientCoordinate);
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml
new file mode 100644
index 0000000..99b9ac5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml
@@ -0,0 +1,12 @@
+import QtQuick 1.0
+
+Rectangle {
+    width: 400
+    height: 400
+
+    property bool nullObject
+    Component.onCompleted: nullObject = transitions.length > 0 && transitions[0] === null
+
+    property list<Transition> myTransitions: [Transition {}, Transition {}]
+    transitions: myTransitions
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 00db2d4..5d90597 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -88,6 +88,7 @@ private slots:
     void registrationBug();
     void doubleRegistrationBug();
     void alwaysRunToEndRestartBug();
+    void transitionAssignmentBug();
 };
 
 #define QTIMED_COMPARE(lhs, rhs) do { \
@@ -844,6 +845,18 @@ void tst_qdeclarativeanimations::alwaysRunToEndRestartBug()
     QCOMPARE(static_cast<QDeclarativeAbstractAnimation*>(&animation)->qtAnimation()->state(), QAbstractAnimation::Stopped);
 }
 
+//QTBUG-20227
+void tst_qdeclarativeanimations::transitionAssignmentBug()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/transitionAssignmentBug.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+
+    QCOMPARE(rect->property("nullObject").toBool(), false);
+}
+
 QTEST_MAIN(tst_qdeclarativeanimations)
 
 #include "tst_qdeclarativeanimations.moc"
diff --git a/tests/auto/declarative/qdeclarativebinding/data/deletedObject.qml b/tests/auto/declarative/qdeclarativebinding/data/deletedObject.qml
new file mode 100644
index 0000000..ba4c9f6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebinding/data/deletedObject.qml
@@ -0,0 +1,24 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: wrapper
+    width: 400
+    height: 400
+
+    property bool activateBinding: false
+
+    Binding {
+        id: binding
+        target: Qt.createQmlObject('import QtQuick 1.0; Item { property real value: 10 }', wrapper)
+        property: "value"
+        when: activateBinding
+        value: x + y
+    }
+
+    Component.onCompleted: binding.target.destroy();
+
+//    MouseArea {
+//        anchors.fill: parent
+//        onClicked: activateBinding = true;
+//    }
+}
diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
index 6305cd3..ca394b0 100644
--- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -60,6 +60,7 @@ public:
 private slots:
     void binding();
     void whenAfterValue();
+    void deletedObject();
 
 private:
     QDeclarativeEngine engine;
@@ -113,6 +114,22 @@ void tst_qdeclarativebinding::whenAfterValue()
     delete rect;
 }
 
+//QTBUG-20692
+void tst_qdeclarativebinding::deletedObject()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/deletedObject.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+
+    QApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+
+    //don't crash
+    rect->setProperty("activateBinding", true);
+
+    delete rect;
+}
+
 QTEST_MAIN(tst_qdeclarativebinding)
 
 #include "tst_qdeclarativebinding.moc"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20648.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20648.qml
new file mode 100644
index 0000000..40f21ef
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20648.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+QtObject {
+    property bool hd: true
+
+    property real test: ((hd ? 100 : 20) + 0)
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 71214a3..bf7c9a4 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -177,6 +177,7 @@ private slots:
     void aliasWritesOverrideBindings();
     void pushCleanContext();
     void realToInt();
+    void qtbug_20648();
 
     void include();
 
@@ -3090,6 +3091,15 @@ void tst_qdeclarativeecmascript::realToInt()
     QCOMPARE(object->value(), int(8));
 }
 
+void tst_qdeclarativeecmascript::qtbug_20648()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("qtbug_20648.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    QCOMPARE(o->property("test").toInt(), 100);
+    delete o;
+}
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 8530c7f..5d6f2a2 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -1679,15 +1679,26 @@ void tst_qdeclarativetextedit::cursorDelegate()
     QInputMethodEvent event;
     QApplication::sendEvent(view, &event);
 
+
     // Test delegate gets moved on mouse press.
     textEditObject->setSelectByMouse(true);
     textEditObject->setCursorPosition(0);
-    qDebug() << textEditObject->boundingRect() << textEditObject->positionToRectangle(5).center() << view->mapFromScene(textEditObject->positionToRectangle(5).center());
-    QTest::mouseClick(view->viewport(), Qt::LeftButton, 0, view->mapFromScene(textEditObject->positionToRectangle(5).center()));
+    const QPoint point1 = view->mapFromScene(textEditObject->positionToRectangle(5).center());
+    QTest::mouseClick(view->viewport(), Qt::LeftButton, 0, point1);
     QVERIFY(textEditObject->cursorPosition() != 0);
     QCOMPARE(textEditObject->cursorRectangle().x(), qRound(delegateObject->x()));
     QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
 
+    // Test delegate gets moved on mouse drag
+    textEditObject->setCursorPosition(0);
+    const QPoint point2 = view->mapFromScene(textEditObject->positionToRectangle(10).center());
+    QTest::mousePress(view->viewport(), Qt::LeftButton, 0, point1);
+    QMouseEvent mv(QEvent::MouseMove, point2, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(view->viewport(), &mv);
+    QTest::mouseRelease(view->viewport(), Qt::LeftButton, 0, point2);
+    QCOMPARE(textEditObject->cursorRectangle().x(), qRound(delegateObject->x()));
+    QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
+
     textEditObject->setReadOnly(true);
     textEditObject->setCursorPosition(0);
     QTest::mouseClick(view->viewport(), Qt::LeftButton, 0, view->mapFromScene(textEditObject->positionToRectangle(5).center()));
@@ -1696,6 +1707,12 @@ void tst_qdeclarativetextedit::cursorDelegate()
     QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
 
     textEditObject->setCursorPosition(0);
+    QTest::mouseClick(view->viewport(), Qt::LeftButton, 0, view->mapFromScene(textEditObject->positionToRectangle(5).center()));
+    QVERIFY(textEditObject->cursorPosition() != 0);
+    QCOMPARE(textEditObject->cursorRectangle().x(), qRound(delegateObject->x()));
+    QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
+
+    textEditObject->setCursorPosition(0);
     QCOMPARE(textEditObject->cursorRectangle().x(), qRound(delegateObject->x()));
     QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
     QVERIFY(textEditObject->cursorRectangle().y() >= 0);
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp
index cba5fab..256ff29 100644
--- a/tests/auto/lancelot/tst_lancelot.cpp
+++ b/tests/auto/lancelot/tst_lancelot.cpp
@@ -62,6 +62,7 @@ public:
     tst_Lancelot();
 
     static bool simfail;
+    static PlatformInfo clientInfo;
 
 private:
     enum GraphicsEngine {
@@ -98,6 +99,7 @@ private slots:
 };
 
 bool tst_Lancelot::simfail = false;
+PlatformInfo tst_Lancelot::clientInfo;
 
 tst_Lancelot::tst_Lancelot()
 {
@@ -112,7 +114,7 @@ void tst_Lancelot::initTestCase()
 #if defined(Q_OS_SOMEPLATFORM)
     QSKIP("This test is not supported on this platform.", SkipAll);
 #endif
-    if (!proto.connect(QLatin1String("tst_Lancelot"), &dryRunMode))
+    if (!proto.connect(QLatin1String("tst_Lancelot"), &dryRunMode, clientInfo))
         QSKIP(qPrintable(proto.errorMessage()), SkipAll);
 
 #if defined(USE_RUNTIME_DIR)
@@ -329,13 +331,26 @@ QTEST_MAIN(tst_Lancelot)
 
 int main(int argc, char *argv[])
 {
+    tst_Lancelot::clientInfo = PlatformInfo::localHostInfo();
+
     char *fargv[20];
     int fargc = 0;
     for (int i = 0; i < qMin(argc, 19); i++) {
-        if (!qstrcmp(argv[i], "-simfail"))
+        if (!qstrcmp(argv[i], "-simfail")) {
             tst_Lancelot::simfail = true;
-        else
+        } else if (!qstrcmp(argv[i], "-compareto") && i < argc-1) {
+            QString arg = QString::fromLocal8Bit(argv[++i]);
+            int split = arg.indexOf(QLC('='));
+            if (split < 0)
+                continue;
+            QString key = arg.left(split).trimmed();
+            QString value = arg.mid(split+1).trimmed();
+            if (key.isEmpty() || value.isEmpty())
+                continue;
+            tst_Lancelot::clientInfo.addOverride(key, value);
+        } else {
             fargv[fargc++] = argv[i];
+        }
     }
     fargv[fargc] = 0;
     return rmain(fargc, fargv);
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index 6025bdb..0004c42 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -86,14 +86,14 @@ void tst_QAudioInput::initTestCase()
 
     // Only perform tests if audio input device exists!
     QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
-    if(devices.size() > 0)
+    if (devices.size() > 0)
         available = true;
     else {
         qWarning()<<"NOTE: no audio input device found, no test will be performed";
         available = false;
     }
 
-    if(available)
+    if (available)
         audio = new QAudioInput(format, this);
 }
 
@@ -124,6 +124,9 @@ void tst_QAudioInput::invalidFormat_data()
 
 void tst_QAudioInput::invalidFormat()
 {
+    if (!available)
+        QSKIP("No audio input device found, no test will be performed", SkipAll);
+
     QFETCH(QAudioFormat, invalidFormat);
 
     QAudioInput audioInput(invalidFormat, this);
@@ -140,81 +143,85 @@ void tst_QAudioInput::invalidFormat()
 
 void tst_QAudioInput::settings()
 {
-    if(available) {
-        // Confirm the setting we added in the init function.
-        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());
-    }
+    if (!available)
+        QSKIP("No audio input device found, no test will be performed", SkipAll);
+
+    // Confirm the setting we added in the init function.
+    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::buffers()
 {
-    if(available) {
-        // Should always have a buffer size greater than zero.
-        int store = audio->bufferSize();
-        audio->setBufferSize(4096);
-        QVERIFY(audio->bufferSize() > 0);
-        audio->setBufferSize(store);
-        QVERIFY(audio->bufferSize() == store);
-    }
+    if (!available)
+        QSKIP("No audio input device found, no test will be performed", SkipAll);
+
+    // Should always have a buffer size greater than zero.
+    int store = audio->bufferSize();
+    audio->setBufferSize(4096);
+    QVERIFY(audio->bufferSize() > 0);
+    audio->setBufferSize(store);
+    QVERIFY(audio->bufferSize() == store);
 }
 
 void tst_QAudioInput::notifyInterval()
 {
-    if(available) {
-        QVERIFY(audio->notifyInterval() == 1000);   // Default
+    if (!available)
+        QSKIP("No audio input device found, no test will be performed", SkipAll);
 
-        audio->setNotifyInterval(500);
-        QVERIFY(audio->notifyInterval() == 500);    // Custom
+    QVERIFY(audio->notifyInterval() == 1000);   // Default
 
-        audio->setNotifyInterval(1000);             // reset
-    }
+    audio->setNotifyInterval(500);
+    QVERIFY(audio->notifyInterval() == 500);    // Custom
+
+    audio->setNotifyInterval(1000);             // reset
 }
 
 void tst_QAudioInput::pullFile()
 {
-    if(available) {
-        QFile filename(SRCDIR"test.raw");
-        filename.open( QIODevice::WriteOnly | QIODevice::Truncate );
-
-        QSignalSpy readSignal(audio, SIGNAL(notify()));
-        QSignalSpy stateSignal(audio, SIGNAL(stateChanged(QAudio::State)));
-
-        // Always have default states, before start
-        QVERIFY(audio->state() == QAudio::StoppedState);
-        QVERIFY(audio->error() == QAudio::NoError);
-        QVERIFY(audio->elapsedUSecs() == 0);
-
-        audio->start(&filename);
-        QTest::qWait(20);
-        // Check state and periodSize() are valid non-zero values.
-        QVERIFY(audio->state() == QAudio::ActiveState);
-        QVERIFY(audio->error() == QAudio::NoError);
-        QVERIFY(audio->elapsedUSecs() > 10000 && audio->elapsedUSecs() < 800000);
-        QVERIFY(audio->periodSize() > 0);
-        QVERIFY(stateSignal.count() == 1); // State changed to QAudio::ActiveState
-
-        // Wait until finished...
-        QTest::qWait(5000);
-
-        QVERIFY(readSignal.count() > 0);
-        QVERIFY(audio->processedUSecs() > 0);
-
-        audio->stop();
-        QTest::qWait(20);
-        QVERIFY(audio->state() == QAudio::StoppedState);
-        QVERIFY(audio->elapsedUSecs() == 0);
-        // Can only check to make sure we got at least 1 more signal, but can be more.
-        QVERIFY(stateSignal.count() > 1);
-
-        filename.close();
-    }
+    if (!available)
+        QSKIP("No audio input device found, no test will be performed", SkipAll);
+
+    QFile filename(SRCDIR"test.raw");
+    filename.open( QIODevice::WriteOnly | QIODevice::Truncate );
+
+    QSignalSpy readSignal(audio, SIGNAL(notify()));
+    QSignalSpy stateSignal(audio, SIGNAL(stateChanged(QAudio::State)));
+
+    // Always have default states, before start
+    QVERIFY(audio->state() == QAudio::StoppedState);
+    QVERIFY(audio->error() == QAudio::NoError);
+    QVERIFY(audio->elapsedUSecs() == 0);
+
+    audio->start(&filename);
+    QTest::qWait(20);
+    // Check state and periodSize() are valid non-zero values.
+    QVERIFY(audio->state() == QAudio::ActiveState);
+    QVERIFY(audio->error() == QAudio::NoError);
+    QVERIFY(audio->elapsedUSecs() > 10000 && audio->elapsedUSecs() < 800000);
+    QVERIFY(audio->periodSize() > 0);
+    QVERIFY(stateSignal.count() == 1); // State changed to QAudio::ActiveState
+
+    // Wait until finished...
+    QTest::qWait(5000);
+
+    QVERIFY(readSignal.count() > 0);
+    QVERIFY(audio->processedUSecs() > 0);
+
+    audio->stop();
+    QTest::qWait(20);
+    QVERIFY(audio->state() == QAudio::StoppedState);
+    QVERIFY(audio->elapsedUSecs() == 0);
+    // Can only check to make sure we got at least 1 more signal, but can be more.
+    QVERIFY(stateSignal.count() > 1);
+
+    filename.close();
 }
 
 QTEST_MAIN(tst_QAudioInput)
diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp
index 6d9f798..86dde21 100644
--- a/tests/auto/qdialog/tst_qdialog.cpp
+++ b/tests/auto/qdialog/tst_qdialog.cpp
@@ -467,6 +467,22 @@ void tst_QDialog::throwInExec()
 #if defined(Q_WS_MAC) || (defined(Q_WS_WINCE) && defined(_ARM_))
     QSKIP("Throwing exceptions in exec() is not supported on this platform.", SkipAll);
 #endif
+
+#if defined(Q_OS_LINUX)
+    // C++ exceptions can't be passed through glib callbacks.  Skip the test if
+    // we're using the glib event loop.
+    QByteArray dispatcher = QAbstractEventDispatcher::instance()->metaObject()->className();
+    if (dispatcher.contains("Glib")) {
+        QSKIP(
+            qPrintable(QString(
+                "Throwing exceptions in exec() won't work if %1 event dispatcher is used.\n"
+                "Try running with QT_NO_GLIB=1 in environment."
+            ).arg(QString::fromLatin1(dispatcher))),
+            SkipAll
+        );
+    }
+#endif
+
     int caughtExceptions = 0;
     try {
         ExceptionDialog dialog;
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index 08d2e88..81da8a3 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -80,7 +80,9 @@
 # define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/"
 #elif defined(Q_OS_UNIX)
 #ifdef QT_BUILD_INTERNAL
+QT_BEGIN_NAMESPACE
 extern Q_GUI_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded = 0);
+QT_END_NAMESPACE
 #endif
 #endif
 
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp
index 6abbdcd..2c88561 100644
--- a/tests/auto/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/qlineedit/tst_qlineedit.cpp
@@ -1770,6 +1770,13 @@ void tst_QLineEdit::passwordEchoDelay()
     QApplication::sendEvent(testWidget, &ev);
     QCOMPARE(testWidget->displayText(), QString(7, fillChar) + QLatin1Char('7'));
 
+    testWidget->setCursorPosition(3);
+    QCOMPARE(testWidget->displayText(), QString(7, fillChar) + QLatin1Char('7'));
+    QTest::keyPress(testWidget, 'a');
+    QCOMPARE(testWidget->displayText(), QString(3, fillChar) + QLatin1Char('a') + QString(5, fillChar));
+    QTest::keyPress(testWidget, Qt::Key_Backspace);
+    QCOMPARE(testWidget->displayText(), QString(8, fillChar));
+
     // restore clean state
     testWidget->setEchoMode(QLineEdit::Normal);
 }
diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/qpushbutton/tst_qpushbutton.cpp
index 7742f6b..db4f385 100644
--- a/tests/auto/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/qpushbutton/tst_qpushbutton.cpp
@@ -91,6 +91,9 @@ private slots:
     void animateClick();
     void toggle();
     void clicked();
+#ifdef Q_OS_MAC
+    void macClicked();
+#endif
     void toggled();
     void isEnabled();
     void defaultAndAutoDefault();
@@ -469,6 +472,34 @@ void tst_QPushButton::clicked()
     QCOMPARE( release_count, (uint)10 );
 }
 
+#ifdef Q_OS_MAC
+// test that the corners of a mac style button are not treated as clicks.
+// but that if a style is applied, they are.
+void tst_QPushButton::macClicked()
+{
+    QPushButton *macTestWidget = new QPushButton( "Push button" );
+    macTestWidget->show();
+    connect( macTestWidget, SIGNAL(clicked()), this, SLOT(onClicked()) );
+
+    QTest::mouseClick( macTestWidget, Qt::LeftButton, 0, QPoint(1,1) );
+    QVERIFY( click_count == 0 );
+
+    QTest::mouseClick( macTestWidget, Qt::LeftButton, 0, macTestWidget->rect().center() );
+    QVERIFY( click_count == 1 );
+
+    resetCounters();
+    macTestWidget->setStyleSheet("background: white;");
+
+    QTest::mouseClick( macTestWidget, Qt::LeftButton, 0, QPoint(1,1) );
+    QVERIFY( click_count == 1 );
+
+    QTest::mouseClick( macTestWidget, Qt::LeftButton, 0, macTestWidget->rect().center() );
+    QVERIFY( click_count == 2 );
+
+    delete macTestWidget;
+}
+#endif
+
 /*
 void tst_QPushButton::group()
 {
diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/qtextcursor/tst_qtextcursor.cpp
index 2b0ba42..cc3b1dc 100644
--- a/tests/auto/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/qtextcursor/tst_qtextcursor.cpp
@@ -50,6 +50,7 @@
 #include <qabstracttextdocumentlayout.h>
 #include <qtextlayout.h>
 #include <qtextcursor.h>
+#include <qtextobject.h>
 #include <qdebug.h>
 
 //TESTED_FILES=gui/text/qtextcursor.cpp gui/text/qtextcursor_p.h
@@ -154,6 +155,8 @@ private slots:
     void cursorPositionWithBlockUndoAndRedo2();
     void cursorPositionWithBlockUndoAndRedo3();
 
+    void joinNonEmptyRemovedBlockUserState();
+
 private:
     int blockCount();
 
@@ -1858,5 +1861,20 @@ void tst_QTextCursor::cursorPositionWithBlockUndoAndRedo3()
     QCOMPARE(cursor.position(), cursorPositionBefore);
 }
 
+void tst_QTextCursor::joinNonEmptyRemovedBlockUserState()
+{
+    cursor.insertText("Hello");
+    cursor.insertBlock();
+    cursor.insertText("World");
+    cursor.block().setUserState(10);
+
+    cursor.movePosition(QTextCursor::EndOfBlock);
+    cursor.movePosition(QTextCursor::PreviousBlock, QTextCursor::KeepAnchor);
+    cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
+    cursor.removeSelectedText();
+
+    QCOMPARE(cursor.block().userState(), 10);
+}
+
 QTEST_MAIN(tst_QTextCursor)
 #include "tst_qtextcursor.moc"