diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 14 | ||||
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index b96cf193cb..85905c0dd8 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -110,7 +110,7 @@ available when you import \c QtQuick. \l{qtqml-cppintegration-data.html}{passed into QML from C++} is automatically converted into a \c color value, and vice-versa. - This value type is provided by the QtQuick import. + This value type is provided by the \l[QML]{QtQuick} import. \section1 SVG Color Reference @@ -234,7 +234,7 @@ available when you import \c QtQuick. \l{qtqml-cppintegration-data.html}{passed into QML from C++} is automatically converted into a \c font value, and vice-versa. - This value type is provided by the QtQuick import. + This value type is provided by the \l[QML]{QtQuick} import. Numerical values for font weights follow the CSS specification, where a weight of 100 is extremely light, and 900 is extremely bold. @@ -397,7 +397,7 @@ console.log(c + " " + d); // false true \endcode \endtable - This value type is provided by the QtQuick import. + This value type is provided by the \l[QML]{QtQuick} import. \sa {QML Value Types} */ @@ -571,7 +571,7 @@ console.log(c + " " + d); // false true \endcode \endtable - This value type is provided by the QtQuick import. + This value type is provided by the \l[QML]{QtQuick} import. \sa {QML Value Types} */ @@ -716,7 +716,7 @@ console.log(c + " " + d); // false true \endcode \endtable - This value type is provided by the QtQuick import. + This value type is provided by the \l[QML]{QtQuick} import. \sa {QML Value Types} */ @@ -879,7 +879,7 @@ console.log(c + " " + d); // false true Properties of type \c quaternion have \c {Qt.quaternion(1, 0, 0, 0)} as their default value. - This value type is provided by the QtQuick import. + This value type is provided by the \l[QML]{QtQuick} import. \sa {QML Value Types} */ @@ -1153,7 +1153,7 @@ console.log(c + " " + d); // false true \endcode \endtable - This value type is provided by the QtQuick import. + This value type is provided by the \l[QML]{QtQuick} import. \sa {QML Value Types} */ diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 88a18bff01..42bec16d78 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1464,9 +1464,10 @@ QSize QQuickWidget::initialSize() const } /*! - Returns the view's root \l {QQuickItem} {item}. Can be null + Returns the view's root \l {QQuickItem} {item}. Can be \nullptr when setSource() has not been called, if it was called with - broken QtQuick code or while the QtQuick contents are being created. + broken \l[QML]{QtQuick} code or if the root item is otherwise + undefined. */ QQuickItem *QQuickWidget::rootObject() const { |