diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-02-01 10:33:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-01 12:31:16 +0100 |
| commit | 256dc059eeea05878112e4cbb55d9a152d21fa1a (patch) | |
| tree | ac6b92ec5dd09f874d05f223ef9b274374d2bf1b /src/gui | |
| parent | f9725ce9c2d16474ca47ab6ac25f5df748b12ab5 (diff) | |
| parent | 6239af6f0f15871e02a516c97c5f1775743d352b (diff) | |
Merge "Merge branch 'release' into stable" into refs/staging/stable
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpixmapcache.cpp | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopengl.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 47d6f33634..4a8330d9f3 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE memory. The \e{Qt Quarterly} article - \l{http://qt.nokia.com/doc/qq/qq12-qpixmapcache.html}{Optimizing + \l{http://doc.qt.digia.com/qq/qq12-qpixmapcache.html}{Optimizing with QPixmapCache} explains how to use QPixmapCache to speed up applications by caching the results of painting. diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index ba421bd1c1..9d29e07319 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -95,6 +95,7 @@ typedef GLfloat GLdouble; # if defined(Q_OS_WIN) # include <QtCore/qt_windows.h> # endif +# define GL_GLEXT_LEGACY // Prevents GL/gl.h form #including system glext.h # include <GL/gl.h> # include <QtGui/qopenglext.h> # endif // Q_OS_MAC |