summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-19 00:35:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-19 00:35:19 (GMT)
commit0cb57328453c476b01b058d57211afee197d6a82 (patch)
tree87f58d0ba221606701c888db2a5f2262cc384cf8 /src/imports
parentff7f7dd596511de4c629b6c7f97d32a21049bb95 (diff)
parent7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a (diff)
downloadQt-0cb57328453c476b01b058d57211afee197d6a82.zip
Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.gz
Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/shaders/shadereffectitem.cpp20
-rw-r--r--src/imports/shaders/shadereffectsource.cpp30
2 files changed, 0 insertions, 50 deletions
diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp
index 056581c..ca5c9a3 100644
--- a/src/imports/shaders/shadereffectitem.cpp
+++ b/src/imports/shaders/shadereffectitem.cpp
@@ -243,11 +243,6 @@ ShaderEffectItem::~ShaderEffectItem()
*/
-/*!
- \property ShaderEffectItem::fragmentShader
- \brief the OpenGL fragment shader code.
-*/
-
void ShaderEffectItem::setFragmentShader(const QString &code)
{
if (m_fragment_code.constData() == code.constData())
@@ -281,11 +276,6 @@ void ShaderEffectItem::setFragmentShader(const QString &code)
*/
-/*!
- \property ShaderEffectItem::vertexShader
- \brief the OpenGL vertex shader code.
-*/
-
void ShaderEffectItem::setVertexShader(const QString &code)
{
if (m_vertex_code.constData() == code.constData())
@@ -320,11 +310,6 @@ void ShaderEffectItem::setVertexShader(const QString &code)
The default value is true.
*/
-/*!
- \property ShaderEffectItem::blending
- \brief the drawing is done using blending.
-*/
-
void ShaderEffectItem::setBlending(bool enable)
{
if (m_blending == enable)
@@ -347,11 +332,6 @@ void ShaderEffectItem::setBlending(bool enable)
The default value is QSize(1,1).
*/
-/*!
- \property ShaderEffectItem::meshResolution
- \brief the amount of triangles in the mesh for both x and y-axis.
-*/
-
void ShaderEffectItem::setMeshResolution(const QSize &size)
{
if (size == m_meshResolution)
diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp
index 6210c41..7916538 100644
--- a/src/imports/shaders/shadereffectsource.cpp
+++ b/src/imports/shaders/shadereffectsource.cpp
@@ -105,11 +105,6 @@ ShaderEffectSource::~ShaderEffectSource()
sourceItem regardless of its clipping property.
*/
-/*!
- \property ShaderEffectSource::sourceItem
- \brief the Item which is the source for the effect.
-*/
-
void ShaderEffectSource::setSourceItem(QDeclarativeItem *item)
{
if (item == m_sourceItem)
@@ -159,11 +154,6 @@ void ShaderEffectSource::setSourceItem(QDeclarativeItem *item)
The default value is Qt.rect(0,0,0,0).
*/
-/*!
- \property ShaderEffectSource::sourceRect
- \brief the relative sourceRect for the source.
-*/
-
void ShaderEffectSource::setSourceRect(const QRectF &rect)
{
if (rect == m_sourceRect)
@@ -192,11 +182,6 @@ void ShaderEffectSource::setSourceRect(const QRectF &rect)
The default value is QSize(0,0).
*/
-/*!
- \property ShaderEffectSource::textureSize
- \brief the texture size for the source.
-*/
-
void ShaderEffectSource::setTextureSize(const QSize &size)
{
if (size == m_textureSize)
@@ -227,11 +212,6 @@ void ShaderEffectSource::setTextureSize(const QSize &size)
The default value is true.
*/
-/*!
- \property ShaderEffectSource::live
- \brief the flag tells whether source item content is changing between frames.
-*/
-
void ShaderEffectSource::setLive(bool s)
{
if (s == m_live)
@@ -251,11 +231,6 @@ void ShaderEffectSource::setLive(bool s)
The default value is false.
*/
-/*!
- \property ShaderEffectSource::hideSource
- \brief the flag tells whether original source item content should be hidden.
-*/
-
void ShaderEffectSource::setHideSource(bool hide)
{
if (hide == m_hideSource)
@@ -283,11 +258,6 @@ void ShaderEffectSource::setHideSource(bool hide)
*/
-/*!
- \property ShaderEffectSource::wrapMode
- \brief the wrap parameter for the source after it has been mapped as a texture.
-*/
-
void ShaderEffectSource::setWrapMode(WrapMode mode)
{
if (mode == m_wrapMode)