diff options
author | Martin Smith <martin.smith@qt.io> | 2018-02-12 15:24:42 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2018-02-23 13:04:57 +0000 |
commit | a025b7ece6909696b6d6cd3565138b81c7f2763b (patch) | |
tree | 1ef307d43af782f2c90ad89fec65e273b8673647 /src | |
parent | 693aeb803b64280ee3b4b5c024371f31a6f0089a (diff) |
doc: Fix remaining "Can't tie this..." errors
This update mostly removes qdoc comment markers from comments that
should not have been qdoc comments.
Change-Id: I8ccaa7fd4ae610371e25066e048fcba6cfba8038
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 7 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 16 | ||||
-rw-r--r-- | src/quick/util/qquicktimeline.cpp | 2 | ||||
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 6 |
7 files changed, 18 insertions, 21 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); diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index e5334d59e1..a6819b338d 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -363,13 +363,6 @@ void QSGRenderContext::registerFontengineForCleanup(QFontEngine *engine) } /*! - Factory function for texture objects. - - If \a image is a valid image, the QSGTexture::setImage function - will be called with \a image as argument. - */ - -/*! Factory function for the scene graph renderers. The renderers are used for the toplevel renderer and once for every diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index ca1fb9ba5c..e74ba83e7f 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE extern bool qsg_useConsistentTiming(); extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha); #if QT_CONFIG(opengl) -/*! +/* expectations for this manager to work: - one opengl context to render multiple windows - OpenGL pipeline will not block for vsync in swap diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 971694db42..c2f0cc4716 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -530,7 +530,7 @@ void QSGRenderThread::invalidateOpenGL(QQuickWindow *window, bool inDestructor, } } -/*! +/* Enters the mutex lock to make sure GUI is blocking and performs sync, then wakes GUI. */ @@ -870,7 +870,7 @@ void QSGThreadedRenderLoop::hide(QQuickWindow *window) } -/*! +/* If the window is first hide it, then perform a complete cleanup with releaseResources which will take down the GL context and exit the rendering thread. @@ -920,7 +920,7 @@ void QSGThreadedRenderLoop::exposureChanged(QQuickWindow *window) } } -/*! +/* Will post an event to the render thread that this window should start to render. */ @@ -1007,7 +1007,7 @@ void QSGThreadedRenderLoop::handleExposure(QQuickWindow *window) startOrStopAnimationTimer(); } -/*! +/* This function posts an event to the render thread to remove the window from the list of windowses to render. @@ -1042,7 +1042,7 @@ void QSGThreadedRenderLoop::maybeUpdate(QQuickWindow *window) maybeUpdate(w); } -/*! +/* Called whenever the QML scene has changed. Will post an event to ourselves that a sync is needed. */ @@ -1073,7 +1073,7 @@ void QSGThreadedRenderLoop::maybeUpdate(Window *w) maybePostPolishRequest(w); } -/*! +/* Called when the QQuickWindow should be explicitly repainted. This function can also be called on the render thread when the GUI thread is blocked to keep render thread animations alive. @@ -1105,7 +1105,7 @@ void QSGThreadedRenderLoop::releaseResources(QQuickWindow *window) releaseResources(w, false); } -/*! +/* * Release resources will post an event to the render thread to * free up the SG and GL resources and exists the render thread. */ @@ -1304,7 +1304,7 @@ QImage QSGThreadedRenderLoop::grab(QQuickWindow *window) return result; } -/*! +/* * Posts a new job event to the render thread. * Returns true if posting succeeded. */ diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp index b3f0caa2b3..1f4ac08d4d 100644 --- a/src/quick/util/qquicktimeline.cpp +++ b/src/quick/util/qquicktimeline.cpp @@ -854,7 +854,7 @@ void QQuickTimeLine::remove(QQuickTimeLineObject *v) if (d->ops.isEmpty()) { stop(); d->clockRunning = false; - } else if (/*!GfxClock::isActive()*/ state() != Running) { + } else if (state() != Running) { // was !GfxClock::isActive() stop(); d->prevTime = 0; d->clockRunning = true; diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 00aec0113c..6a767dbb46 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -489,7 +489,8 @@ QImage QQuickWidgetPrivate::grabFramebuffer() */ -/*! \fn void QQuickWidget::statusChanged(QQuickWidget::Status status) +/*! + \fn void QQuickWidget::statusChanged(QQuickWidget::Status status) This signal is emitted when the component's current \a status changes. */ @@ -1649,6 +1650,9 @@ QQuickWindow *QQuickWidget::quickWindow() const return d->offscreenWindow; } +/*! + \reimp + */ void QQuickWidget::paintEvent(QPaintEvent *event) { Q_D(QQuickWidget); |