AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSurfaceFormat: Use version in comparison and debug, fix setter.

Browse Source 
Change-Id: Id123ca9366b97a172e08a4608ccdffafb7caaf09
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Friedemann Kleint 2011-10-18 11:46:13 +02:00 committed by Qt by Nokia
parent 36eb5fb732
commit 08e2485860
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/kernel/qsurfaceformat.cpp
View File

@ -391,7 +391,10 @@ QSurfaceFormat::OpenGLContextProfile QSurfaceFormat::profile() const
*/
void QSurfaceFormat::setMajorVersion(int major)
{
d->major = major;
if (d->major != major) {
detach();
d->major = major;
}
}
/*!
@ -407,7 +410,10 @@ int QSurfaceFormat::majorVersion() const
*/
void QSurfaceFormat::setMinorVersion(int minor)
{
d->minor = minor;
if (d->minor != minor) {
detach();
d->minor = minor;
}
}
/*!
@ -429,10 +435,11 @@ bool operator==(const QSurfaceFormat& a, const QSurfaceFormat& b)
&& a.d->depthSize == b.d->depthSize
&& a.d->numSamples == b.d->numSamples
&& a.d->swapBehavior == b.d->swapBehavior
&& a.d->profile == b.d->profile);
&& a.d->profile == b.d->profile
&& a.d->major == b.d->major
&& a.d->minor == b.d->minor);
}
/*!
Returns false if all the options of the two QSurfaceFormat objects
\a a and \a b are equal; otherwise returns true.
@ -451,7 +458,8 @@ QDebug operator<<(QDebug dbg, const QSurfaceFormat &f)
const QSurfaceFormatPrivate * const d = f.d;
dbg.nospace() << "QSurfaceFormat("
<< "options " << d->opts
<< "version " << d->major << '.' << d->minor
<< ", options " << d->opts
<< ", depthBufferSize " << d->depthSize
<< ", redBufferSize " << d->redBufferSize
<< ", greenBufferSize " << d->greenBufferSize