diff options
-rw-r--r-- | src/qml/doc/src/external-resources.qdoc | 4 | ||||
-rw-r--r-- | src/qml/doc/src/javascript/hostenvironment.qdoc | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlapplicationengine_p.h | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml | 6 |
5 files changed, 11 insertions, 5 deletions
diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc index 17ac7693bc..c11174db43 100644 --- a/src/qml/doc/src/external-resources.qdoc +++ b/src/qml/doc/src/external-resources.qdoc @@ -76,3 +76,7 @@ \externalpage https://fontawesome.com/ \title Font Awesome */ +/*! + \externalpage https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Nullish_coalescing_operator + \title Nullish Coalescing +*/ diff --git a/src/qml/doc/src/javascript/hostenvironment.qdoc b/src/qml/doc/src/javascript/hostenvironment.qdoc index c22c392b80..bc75f843fb 100644 --- a/src/qml/doc/src/javascript/hostenvironment.qdoc +++ b/src/qml/doc/src/javascript/hostenvironment.qdoc @@ -42,6 +42,8 @@ Like a browser or server-side JavaScript environment, the QML runtime implements all of the built-in types and functions defined by the standard, such as Object, Array, and Math. The QML runtime implements the 7th edition of the standard. +Since Qt 5.15 \l{Nullish Coalescing} is also implemented in the QML runtime. + The standard ECMAScript built-ins are not explicitly documented in the QML documentation. For more information on their use, please refer to the ECMA-262 7th edition standard or one of the many online JavaScript reference and tutorial sites, such as the \l{W3Schools JavaScript Reference} (JavaScript Objects diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index 7d961cd0c7..6ee03b39e5 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -106,8 +106,6 @@ void QQmlApplicationEnginePrivate::_q_loadTranslations() activeTranslator.reset(); } q->retranslate(); -#else - Q_UNUSED(rootFile) #endif } diff --git a/src/qml/qml/qqmlapplicationengine_p.h b/src/qml/qml/qqmlapplicationengine_p.h index c514e3daf9..86f492510f 100644 --- a/src/qml/qml/qqmlapplicationengine_p.h +++ b/src/qml/qml/qqmlapplicationengine_p.h @@ -75,7 +75,9 @@ public: QList<QObject *> objects; QVariantMap initialProperties; QString translationsDirectory; +#if QT_CONFIG(translation) QScopedPointer<QTranslator> activeTranslator; +#endif }; QT_END_NAMESPACE diff --git a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml index 0732884c97..f61e2e0f48 100644 --- a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml +++ b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml @@ -118,10 +118,10 @@ Item { function test_warnAboutLayoutItemsWithAnchors() { - var fullPath = Qt.resolvedUrl("tst_rowlayout.qml") + var regex = new RegExp("QML Item: Detected anchors on an item that is managed by a layout. " + + "This is undefined behavior; use Layout.alignment instead.") for (var i = 0; i < 7; ++i) { - ignoreWarning(fullPath + ":" + (75 + 5*i) +":17: QML Item: Detected anchors on an item that is managed by a layout. " - + "This is undefined behavior; use Layout.alignment instead.") + ignoreWarning(regex) } var layout = itemsWithAnchorsLayout_Component.createObject(container) waitForRendering(layout) |