Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 1 insertions, 26 deletions

diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index e033076..f8607cc 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -109,8 +109,6 @@ public:
 */
 
 /*!
-    \since 4.6
-
     Creates a QGLFramebufferObjectFormat object with properties specifying
     the format of an OpenGL framebuffer object.
 
@@ -146,8 +144,6 @@ QGLFramebufferObjectFormat::QGLFramebufferObjectFormat(int samples,
 }
 
 /*!
-    \since 4.6
-
     Constructs a copy of \a other.
 */
 
@@ -158,8 +154,6 @@ QGLFramebufferObjectFormat::QGLFramebufferObjectFormat(const QGLFramebufferObjec
 }
 
 /*!
-    \since 4.6
-
     Assigns \a other to this object.
 */
 
@@ -170,8 +164,6 @@ QGLFramebufferObjectFormat &QGLFramebufferObjectFormat::operator=(const QGLFrame
 }
 
 /*!
-    \since 4.6
-
     Destroys the QGLFramebufferObjectFormat.
 */
 QGLFramebufferObjectFormat::~QGLFramebufferObjectFormat()
@@ -180,8 +172,6 @@ QGLFramebufferObjectFormat::~QGLFramebufferObjectFormat()
 }
 
 /*!
-    \since 4.6
-
     Sets the number of samples per pixel for a multisample framebuffer object
     to \a samples.
     A sample count of 0 represents a regular non-multisample framebuffer object.
@@ -194,8 +184,6 @@ void QGLFramebufferObjectFormat::setSamples(int samples)
 }
 
 /*!
-    \since 4.6
-
     Returns the number of samples per pixel if a framebuffer object
     is a multisample framebuffer object. Otherwise, returns 0.
 
@@ -207,8 +195,6 @@ int QGLFramebufferObjectFormat::samples() const
 }
 
 /*!
-    \since 4.6
-
     Sets the attachments a framebuffer object should have to \a attachment.
 
     \sa attachment()
@@ -219,8 +205,6 @@ void QGLFramebufferObjectFormat::setAttachment(QGLFramebufferObject::Attachment
 }
 
 /*!
-    \since 4.6
-
     Returns the status of the depth and stencil buffers attached to
     a framebuffer object.
 
@@ -232,8 +216,6 @@ QGLFramebufferObject::Attachment QGLFramebufferObjectFormat::attachment() const
 }
 
 /*!
-    \since 4.6
-
     Sets the texture target of the texture attached to a framebuffer object to
     \a target. Ignored for multisample framebuffer objects.
 
@@ -245,8 +227,6 @@ void QGLFramebufferObjectFormat::setTextureTarget(GLenum target)
 }
 
 /*!
-    \since 4.6
-
     Returns the texture target of the texture attached to a framebuffer object.
     Ignored for multisample framebuffer objects.
 
@@ -258,8 +238,6 @@ GLenum QGLFramebufferObjectFormat::textureTarget() const
 }
 
 /*!
-    \since 4.6
-
     Sets the internal format of a framebuffer object's texture or multisample
     framebuffer object's color buffer to \a internalFormat.
 
@@ -271,8 +249,6 @@ void QGLFramebufferObjectFormat::setInternalFormat(GLenum internalFormat)
 }
 
 /*!
-    \since 4.6
-
     Returns the internal format of a framebuffer object's texture or
     multisample framebuffer object's color buffer.
 
@@ -1055,8 +1031,7 @@ GLuint QGLFramebufferObject::handle() const
 }
 
 /*! \fn int QGLFramebufferObject::devType() const
-
-    \reimp
+    \internal
 */