aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-02-20 14:48:46 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-02-23 12:17:55 +0000
commit5d4fd80e1e5290ccfe7ef216420a457f57d64705 (patch)
tree9e3fec64ec9476254e0b57e3278a7493a9e8162e
parent4db31cbd4e29cf5387f4332537f8ea9e0e9f62ae (diff)
Fix some qdoc-warnings.
qtdeclarative/src/quick/scenegraph/coreapi/qsgmaterial.cpp:384: warning: Class RenderState has no \inmodule command; using project name by default: QtQuick qtdeclarative/src/quick/scenegraph/util/qsgsimplerectnode.cpp:39: warning: Class QSGSimpleRectNode has no \inmodule command; using project name by default: QtQuick qtdeclarative/src/quick/scenegraph/util/qsgtextureprovider.cpp:38: warning: Class QSGTextureProvider has no \inmodule command; using project name by default: QtQuick qtdeclarative/src/quick/items/qquickwindow.cpp:3156: warning: Cannot find 'closing(...)' in '\fn' void QQuickWindow::closing() qtdeclarative/src/quick/items/qquickwindow.h:160: warning: No documentation for 'QQuickWindow::closing()' qtdeclarative/src/quick/items/qquickwindow.cpp:3134: warning: Can't link to 'Window.closing()' qtdeclarative/src/qml/qml/qqmlfileselector.cpp:90: warning: Undocumented parameter 'parent' in QQmlFileSelector::QQmlFileSelector() Change-Id: I42cf1e06c9e7a63327acc470bd33a726acc69bfc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
-rw-r--r--src/qml/qml/qqmlfileselector.cpp6
-rw-r--r--src/quick/items/qquickwindow.cpp6
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterial.cpp1
-rw-r--r--src/quick/scenegraph/util/qsgsimplerectnode.cpp1
-rw-r--r--src/quick/scenegraph/util/qsgtextureprovider.cpp1
5 files changed, 9 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlfileselector.cpp b/src/qml/qml/qqmlfileselector.cpp
index 4939ac15c4..2b3c2ade4f 100644
--- a/src/qml/qml/qqmlfileselector.cpp
+++ b/src/qml/qml/qqmlfileselector.cpp
@@ -88,9 +88,9 @@ Q_GLOBAL_STATIC(interceptorSelectorMap, interceptorInstances);
*/
/*!
- Creates a new QQmlFileSelector, which includes its own QFileSelector.
- \a engine is the QQmlEngine you wish to apply file selectors too. It will
- also take ownership of the QQmlFileSelector.
+ Creates a new QQmlFileSelector with parent object \a parent, which includes
+ its own QFileSelector. \a engine is the QQmlEngine you wish to apply file
+ selectors to. It will also take ownership of the QQmlFileSelector.
*/
QQmlFileSelector::QQmlFileSelector(QQmlEngine* engine, QObject* parent)
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 8ac6ac7d6d..12be50ba6d 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3154,11 +3154,11 @@ bool QQuickWindow::isSceneGraphInitialized() const
*/
/*!
- \fn void QQuickWindow::closing()
+ \fn void QQuickWindow::closing(QQuickCloseEvent *close)
\since 5.1
- This signal is emitted when the window receives a QCloseEvent from the
- windowing system.
+ This signal is emitted when the window receives the event \a close from
+ the windowing system.
*/
/*!
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index b9d191abec..c68c0b93d2 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -385,6 +385,7 @@ void QSGMaterialShader::compile()
\class QSGMaterialShader::RenderState
\brief The QSGMaterialShader::RenderState encapsulates the current rendering state
during a call to QSGMaterialShader::updateState().
+ \inmodule QtQuick
The render state contains a number of accessors that the shader needs to respect
in order to conform to the current state of the scene graph.
diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.cpp b/src/quick/scenegraph/util/qsgsimplerectnode.cpp
index 1ee2dbee81..17aeb515a1 100644
--- a/src/quick/scenegraph/util/qsgsimplerectnode.cpp
+++ b/src/quick/scenegraph/util/qsgsimplerectnode.cpp
@@ -41,6 +41,7 @@ QT_BEGIN_NAMESPACE
\brief The QSGSimpleRectNode class is a convenience class for drawing
solid filled rectangles using scenegraph.
+ \inmodule QtQuick
*/
diff --git a/src/quick/scenegraph/util/qsgtextureprovider.cpp b/src/quick/scenegraph/util/qsgtextureprovider.cpp
index 76328215d4..b9f9bde476 100644
--- a/src/quick/scenegraph/util/qsgtextureprovider.cpp
+++ b/src/quick/scenegraph/util/qsgtextureprovider.cpp
@@ -38,6 +38,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QSGTextureProvider
\brief The QSGTextureProvider class encapsulates texture based entities in QML.
+ \inmodule QtQuick
The QSGTextureProvider lives primarily in the scene graph rendering thread.