dist/changes-5.6.1

@@ -4,7 +4,7 @@ compatibility (source and binary) with Qt 5.6.0.
 For more details, refer to the online documentation included in this
 distribution. The documentation is also available online:
 
-  http://qt-project.org/doc/qt-5.6
+  https://doc.qt.io/qt-5.6
 
 The Qt version 5.6 series is binary compatible with the 5.5.x series.
 Applications compiled for 5.5 will continue to run with 5.6.
@@ -12,7 +12,7 @@ Applications compiled for 5.5 will continue to run with 5.6.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Qt Bug Tracker:
 
-  http://bugreports.qt-project.org/
+  https://bugreports.qt.io/
 
 Each of these identifiers can be entered in the bug tracker to obtain more
 information about a particular change.

src/3rdparty/masm/wtf/MathExtras.h

@@ -106,7 +106,7 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); }
 
 #endif
 
-#if OS(OPENBSD)
+#if OS(OPENBSD) && __cplusplus < 201103L
 
 namespace std {
 

src/imports/localstorage/plugin.cpp

@@ -257,6 +257,15 @@ static ReturnedValue qmlsqldatabase_rows_item(CallContext *ctx)
     return qmlsqldatabase_rows_index(r, scope.engine, ctx->argc() ? ctx->args()[0].toUInt32() : 0);
 }
 
+static QVariant toSqlVariant(QV4::ExecutionEngine *engine, const QV4::ScopedValue &value)
+{
+    // toVariant() maps a null JS value to QVariant(VoidStar), but the SQL module
+    // expects a null variant. (this is because of QTBUG-40880)
+    if (value->isNull())
+        return QVariant();
+    return engine->toVariant(value, /*typehint*/-1);
+}
+
 static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
@@ -287,8 +296,9 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
                 ScopedArrayObject array(scope, values);
                 quint32 size = array->getLength();
                 QV4::ScopedValue v(scope);
-                for (quint32 ii = 0; ii < size; ++ii)
-                    query.bindValue(ii, scope.engine->toVariant((v = array->getIndexed(ii)), -1));
+                for (quint32 ii = 0; ii < size; ++ii) {
+                    query.bindValue(ii, toSqlVariant(scope.engine, (v = array->getIndexed(ii))));
+                }
             } else if (values->as<Object>()) {
                 ScopedObject object(scope, values);
                 ObjectIterator it(scope, object, ObjectIterator::WithProtoChain|ObjectIterator::EnumerableOnly);
@@ -298,7 +308,7 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
                     key = it.nextPropertyName(val);
                     if (key->isNull())
                         break;
-                    QVariant v = scope.engine->toVariant(val, -1);
+                    QVariant v = toSqlVariant(scope.engine, val);
                     if (key->isString()) {
                         query.bindValue(key->stringValue()->toQString(), v);
                     } else {
@@ -307,7 +317,7 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
                     }
                 }
             } else {
-                query.bindValue(0, scope.engine->toVariant(values, -1));
+                query.bindValue(0, toSqlVariant(scope.engine, values));
             }
         }
         if (query.exec()) {

src/qml/jit/qv4regalloc.cpp

@@ -833,6 +833,7 @@ public:
         , _assignedSpillSlots(assignedSpillSlots)
         , _intRegs(intRegs)
         , _fpRegs(fpRegs)
+        , _currentStmt(0)
     {
         _unprocessed = unprocessed;
         _liveAtStart.reserve(function->basicBlockCount());

src/qml/qml.pro

@@ -16,6 +16,11 @@ exists("qqml_enable_gcov") {
     LIBS_PRIVATE += -lgcov
 }
 
+greaterThan(QT_GCC_MAJOR_VERSION, 5) {
+    # Our code is bad. Temporary workaround.
+    QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
+}
+
 QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
 
 # 2415: variable "xx" of static storage duration was declared but never referenced

src/quick/items/qquickitemgrabresult.cpp

@@ -321,7 +321,8 @@ QSharedPointer<QQuickItemGrabResult> QQuickItem::grabToImage(const QSize &target
  * Grabs the item into an in-memory image.
  *
  * The grab happens asynchronously and the JavaScript function \a callback is
- * invoked when the grab is completed.
+ * invoked when the grab is completed. The callback takes one argument, which
+ * is the result of the grab operation; an \l ItemGrabResult object.
  *
  * Use \a targetSize to specify the size of the target image. By default, the result
  * will have the same size as the item.

src/quick/items/qquickmousearea.cpp

@@ -52,7 +52,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVisualTouchDebugging, QML_VISUAL_TOUCH_DEBUGGING)
 QQuickMouseAreaPrivate::QQuickMouseAreaPrivate()
 : enabled(true), scrollGestureEnabled(true), hovered(false), longPress(false),
   moved(false), stealMouse(false), doubleClick(false), preventStealing(false),
-  propagateComposedEvents(false), pressed(0)
+  propagateComposedEvents(false), overThreshold(false), pressed(0)
 #ifndef QT_NO_DRAGANDDROP
   , drag(0)
 #endif
@@ -715,7 +715,7 @@ void QQuickMouseArea::mouseMoveEvent(QMouseEvent *event)
             curLocalPos = event->windowPos();
         }
 
-        if (keepMouseGrab() && d->stealMouse && !d->drag->active())
+        if (keepMouseGrab() && d->stealMouse && d->overThreshold && !d->drag->active())
             d->drag->setActive(true);
 
         QPointF startPos = d->drag->target()->parentItem()
@@ -741,16 +741,19 @@ void QQuickMouseArea::mouseMoveEvent(QMouseEvent *event)
         if (d->drag->active())
             d->drag->target()->setPosition(dragPos);
 
-        if (!keepMouseGrab()
-                && (QQuickWindowPrivate::dragOverThreshold(dragPos.x() - startPos.x(), Qt::XAxis, event, d->drag->threshold())
-                || QQuickWindowPrivate::dragOverThreshold(dragPos.y() - startPos.y(), Qt::YAxis, event, d->drag->threshold()))) {
-            setKeepMouseGrab(true);
-            d->stealMouse = true;
-
+        if (!d->overThreshold && (QQuickWindowPrivate::dragOverThreshold(dragPos.x() - startPos.x(), Qt::XAxis, event, d->drag->threshold())
+                                  || QQuickWindowPrivate::dragOverThreshold(dragPos.y() - startPos.y(), Qt::YAxis, event, d->drag->threshold())))
+        {
+            d->overThreshold = true;
             if (d->drag->smoothed())
                 d->startScene = event->windowPos();
         }
 
+        if (!keepMouseGrab() && d->overThreshold) {
+            setKeepMouseGrab(true);
+            d->stealMouse = true;
+        }
+
         d->moved = true;
     }
 #endif
@@ -767,6 +770,7 @@ void QQuickMouseArea::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_D(QQuickMouseArea);
     d->stealMouse = false;
+    d->overThreshold = false;
     if (!d->enabled && !d->pressed) {
         QQuickItem::mouseReleaseEvent(event);
     } else {
@@ -875,6 +879,7 @@ void QQuickMouseArea::ungrabMouse()
         d->pressed = 0;
         d->stealMouse = false;
         d->doubleClick = false;
+        d->overThreshold = false;
         setKeepMouseGrab(false);
 
 #ifndef QT_NO_DRAGANDDROP

src/quick/items/qquickmousearea_p_p.h

@@ -86,6 +86,7 @@ public:
     bool doubleClick : 1;
     bool preventStealing : 1;
     bool propagateComposedEvents : 1;
+    bool overThreshold : 1;
     Qt::MouseButtons pressed;
 #ifndef QT_NO_DRAGANDDROP
     QQuickDrag *drag;

src/quick/items/qquicktextnodeengine.cpp

@@ -636,9 +636,12 @@ void QQuickTextNodeEngine::addBorder(const QRectF &rect, qreal border,
 void QQuickTextNodeEngine::addFrameDecorations(QTextDocument *document, QTextFrame *frame)
 {
     QTextDocumentLayout *documentLayout = qobject_cast<QTextDocumentLayout *>(document->documentLayout());
-    QTextFrameFormat frameFormat = frame->format().toFrameFormat();
+    if (Q_UNLIKELY(!documentLayout))
+        return;
 
+    QTextFrameFormat frameFormat = frame->format().toFrameFormat();
     QTextTable *table = qobject_cast<QTextTable *>(frame);
+
     QRectF boundingRect = table == 0
             ? documentLayout->frameBoundingRect(frame)
             : documentLayout->tableBoundingRect(table);

tests/auto/qml/qqmlsqldatabase/data/nullvalues.js

+.import QtQuick.LocalStorage 2.0 as Sql
+
+function test() {
+    var db = Sql.LocalStorage.openDatabaseSync("QmlTestDB-nullvalues", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS NullValues(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO NullValues VALUES(?, ?)', [ 'hello', null ]);
+            var firstRow = tx.executeSql("SELECT * FROM NullValues").rows.item(0);
+            if (firstRow.salutation !== "hello")
+               return
+            if (firstRow.salutee === "") {
+                r = "wrong_data_type"
+                return
+            }
+            if (firstRow.salutee === null)
+                r = "passed";
+        }
+    );
+
+    return r;
+}

tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp

@@ -127,7 +127,7 @@ void tst_qqmlsqldatabase::checkDatabasePath()
     QVERIFY(engine->offlineStoragePath().contains("OfflineStorage"));
 }
 
-static const int total_databases_created_by_tests = 12;
+static const int total_databases_created_by_tests = 13;
 void tst_qqmlsqldatabase::testQml_data()
 {
     QTest::addColumn<QString>("jsfile"); // The input file
@@ -149,6 +149,7 @@ void tst_qqmlsqldatabase::testQml_data()
     QTest::newRow("error-outsidetransaction") << "error-outsidetransaction.js"; // reuse above
     QTest::newRow("reopen1") << "reopen1.js";
     QTest::newRow("reopen2") << "reopen2.js"; // re-uses above DB
+    QTest::newRow("null-values") << "nullvalues.js";
 
     // If you add a test, you should usually use a new database in the
     // test - in which case increment total_databases_created_by_tests above.