diff options
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 645f1b72f4..434765aaa1 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -304,7 +304,7 @@ static QStringList qExtractFontFamiliesFromString(const QStringRef &fontFamilies return extractedFamilies; } -/*! +/* Tries to set a family on \a font using the families provided in \a fontFamilyTokens. The list is ordered by preference, with the first family having the highest preference. @@ -364,7 +364,7 @@ if (!(usedTokens & token)) { \ return currentFont; \ } -/*! +/* Parses a font string based on the CSS shorthand font property. See: http://www.w3.org/TR/css3-fonts/#font-prop diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index adf977fe9a..c1148c00d1 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3041,6 +3041,7 @@ void QQuickWindowPrivate::contextCreationFailureMessage(const QSurfaceFormat &fo #if QT_DEPRECATED_SINCE(5, 8) +// ### Qt6: remove /*! Propagates an event \a e to a QQuickItem \a item on the window. @@ -3050,7 +3051,6 @@ void QQuickWindowPrivate::contextCreationFailureMessage(const QSurfaceFormat &fo \deprecated */ -// ### Qt6: remove bool QQuickWindow::sendEvent(QQuickItem *item, QEvent *e) { Q_D(QQuickWindow); |