diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 11:24:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 11:24:47 (GMT) |
| commit | 9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6 (patch) | |
| tree | 36687843f30efa62a4ac37e863da6d3984626be3 /src/3rdparty/phonon/ds9/videorenderer_soft.cpp | |
| parent | 0f3fd01523081656c27ebb7b495c4f1a1c927117 (diff) | |
| parent | 29ec793147054ea4beb1ad4adeebbbe1fe07b260 (diff) | |
| download | Qt-9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6.zip Qt-9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6.tar.gz Qt-9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6.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: (64 commits)
Carbon: usage of menu bars can cause exceptions to be thrown
Mac: compile fix
Fix build
JPEG plugin: Use switch() instead of if()
don't try to build corewlan plugin when corewlan was not found at configure
Avoid conversion to/from QChar in the cn codec to unicode
Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode
fix corewlan detection error when building for 10.5 when 10.6 is also
fixed treatment of zlib on Mac when crossbuilding
Partial overloading support for qdbus cli tool.
Allow empty authority in QUrl::setAuthority as per docs.
Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority.
fixed case of GL include directory
check in MAC_APPLICATION_MENU translations
Re-generate the Unicode tables after updates to the program that generates them
Fix the code after merge: DerivedNormalizationProps has two or more columns
add some usefull definitions to qunicodetables_p.h
qchar.cpp: fix identation
finish last commit
prefer DerivedNormalizationProps.txt over CompositionExclusions.txt
...
Diffstat (limited to 'src/3rdparty/phonon/ds9/videorenderer_soft.cpp')
| -rw-r--r-- | src/3rdparty/phonon/ds9/videorenderer_soft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp index f7d42cf..9c7993c 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp @@ -45,7 +45,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #endif #ifndef QT_NO_OPENGL -#include <gl/gl.h> +#include <GL/gl.h> #ifndef GL_FRAGMENT_PROGRAM_ARB #define GL_FRAGMENT_PROGRAM_ARB 0x8804 #define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 |