diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-26 23:42:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-26 23:42:28 (GMT) |
| commit | 59c58576efd3ceff7add46a359fd99e56a2fb279 (patch) | |
| tree | a23982655f3f7959c9c340b429aebc51435e6676 /src/opengl | |
| parent | d8f757bdb881c3a3d723642734d7d76fae14dce7 (diff) | |
| parent | 1a72f98a15ef78004894dc6636b8a5d969d66fde (diff) | |
| download | Qt-59c58576efd3ceff7add46a359fd99e56a2fb279.zip Qt-59c58576efd3ceff7add46a359fd99e56a2fb279.tar.gz Qt-59c58576efd3ceff7add46a359fd99e56a2fb279.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed copy-paste error in htmlgenerator.cpp
Corrected filename case for wincrypt.h
Add qDebug() operator for QGLFormat
Fix conversion between JavaScript Date and QDateTime
Avoid memory allocation when converting from Gbk to unicode.
Warn if surface creation fails
Doc: fixing search bug
doc: Added more DITA output to the XML generator
QSemaphore::tryAquire(timeout) -- never times out on an active semaphore
Fix warnings in QSslSocketPrivate::systemCaCertificates()
doc: Added more DITA output to the XML generator
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 26 | ||||
| -rw-r--r-- | src/opengl/qgl.h | 7 |
2 files changed, 33 insertions, 0 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index b4c85ac..9effb34 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1521,6 +1521,32 @@ bool operator==(const QGLFormat& a, const QGLFormat& b) && a.d->profile == b.d->profile); } +#ifndef QT_NO_DEBUG_STREAM +QDebug operator<<(QDebug dbg, const QGLFormat &f) +{ + const QGLFormatPrivate * const d = f.d; + + dbg.nospace() << "QGLFormat(" + << "options " << d->opts + << ", plane " << d->pln + << ", depthBufferSize " << d->depthSize + << ", accumBufferSize " << d->accumSize + << ", stencilBufferSize " << d->stencilSize + << ", redBufferSize " << d->redSize + << ", greenBufferSize " << d->greenSize + << ", blueBufferSize " << d->blueSize + << ", alphaBufferSize " << d->alphaSize + << ", samples " << d->numSamples + << ", swapInterval " << d->swapInterval + << ", majorVersion " << d->majorVersion + << ", minorVersion " << d->minorVersion + << ", profile " << d->profile + << ')'; + + return dbg.space(); +} +#endif + /*! Returns false if all the options of the two QGLFormat objects diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index f0b36f7..f85cad5 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -281,6 +281,9 @@ private: friend Q_OPENGL_EXPORT bool operator==(const QGLFormat&, const QGLFormat&); friend Q_OPENGL_EXPORT bool operator!=(const QGLFormat&, const QGLFormat&); +#ifndef QT_NO_DEBUG_STREAM + friend Q_OPENGL_EXPORT QDebug operator<<(QDebug, const QGLFormat &); +#endif }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGLFormat::OpenGLVersionFlags) @@ -288,6 +291,10 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGLFormat::OpenGLVersionFlags) Q_OPENGL_EXPORT bool operator==(const QGLFormat&, const QGLFormat&); Q_OPENGL_EXPORT bool operator!=(const QGLFormat&, const QGLFormat&); +#ifndef QT_NO_DEBUG_STREAM +Q_OPENGL_EXPORT QDebug operator<<(QDebug, const QGLFormat &); +#endif + class Q_OPENGL_EXPORT QGLContext { Q_DECLARE_PRIVATE(QGLContext) |