diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 11:08:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 11:08:04 (GMT) |
| commit | a0d5f436551bfc15b9994220f4cb168cf802c874 (patch) | |
| tree | 32923325a125335edd5fc05df9d2bf40fe16b52a /src/opengl/qgl.cpp | |
| parent | 8ec200f756b021b5c79bcd328815efc5eafda578 (diff) | |
| parent | 2066945370f9d34cf9cff52f87d2f0e78dcb5b09 (diff) | |
| download | Qt-a0d5f436551bfc15b9994220f4cb168cf802c874.zip Qt-a0d5f436551bfc15b9994220f4cb168cf802c874.tar.gz Qt-a0d5f436551bfc15b9994220f4cb168cf802c874.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (108 commits)
Doc: Fixed spelling errors that were blocking the CI system.
QDeclarativeDebug: Fix cases where multiple packets arrive in one go
Fix build break in S60 5.0 environment
Added missing license headers.
Skip softkeys update if application is not on foreground in Symbian
Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
DEF file updates for Symbian
QTBUG-19883 Adding top level TRAP for QThreads on Symbian
Added missing license headers.
Fix js debugging autotest on Windows + Add license header
Rewrite autotests for js debugging
Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
Rename qdeclarativescriptdebugging autotest directory
Fix alignment value not handled in ODF
Silence a compiler warning about unhandled enum in switch
Silence the "array out of bounds" warning in GCC 4.6.
Silence the callgrind warnings in our source code when using gcc 4.6
Create a function that merges the SSE common code
Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
...
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 2b0c8f8..5f5864d 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -366,6 +366,10 @@ void QGL::setPreferredPaintEngine(QPaintEngine::Type engineType) static inline void transform_point(GLdouble out[4], const GLdouble m[16], const GLdouble in[4]) { +#if defined(Q_CC_GNU) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Warray-bounds" +#endif #define M(row,col) m[col*4+row] out[0] = M(0, 0) * in[0] + M(0, 1) * in[1] + M(0, 2) * in[2] + M(0, 3) * in[3]; @@ -376,6 +380,9 @@ static inline void transform_point(GLdouble out[4], const GLdouble m[16], const out[3] = M(3, 0) * in[0] + M(3, 1) * in[1] + M(3, 2) * in[2] + M(3, 3) * in[3]; #undef M +#if defined(Q_CC_GNU) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) +# pragma GCC diagnostic pop +#endif } static inline GLint qgluProject(GLdouble objx, GLdouble objy, GLdouble objz, @@ -1993,7 +2000,7 @@ struct DDSFormat { If you're using double buffering you can swap the screen contents with the off-screen buffer using swapBuffers(). - Please note that QGLContext is not thread safe. + Please note that QGLContext is not \l{thread-safe}. */ /*! @@ -3266,18 +3273,13 @@ bool QGLContext::areSharing(const QGLContext *context1, const QGLContext *contex \fn QColor QGLContext::overlayTransparentColor() const If this context is a valid context in an overlay plane, returns - the plane's transparent color. Otherwise returns an \link - QColor::isValid() invalid \endlink color. - - The returned color's \link QColor::pixel() pixel \endlink value is - the index of the transparent color in the colormap of the overlay - plane. (Naturally, the color's RGB values are meaningless.) + the plane's transparent color. Otherwise returns an + \{QColor::isValid()}{invalid} color. The returned QColor object will generally work as expected only when passed as the argument to QGLWidget::qglColor() or QGLWidget::qglClearColor(). Under certain circumstances it can - also be used to draw transparent graphics with a QPainter. See the - examples/opengl/overlay_x11 example for details. + also be used to draw transparent graphics with a QPainter. */ |