diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 17:27:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 17:27:08 (GMT) |
| commit | e0457144c13fed91571defc3b8fb7fc7ed5a167c (patch) | |
| tree | 7fa72bcacf4f369499d3ea7eae4c4b02a2568118 /src/3rdparty | |
| parent | c6ac9fe2e8d219bb9694efaf5b25ec5108fb8fa6 (diff) | |
| parent | e489e9bc82823f1922a38f1b0805ac8537b1dc77 (diff) | |
| download | Qt-e0457144c13fed91571defc3b8fb7fc7ed5a167c.zip Qt-e0457144c13fed91571defc3b8fb7fc7ed5a167c.tar.gz Qt-e0457144c13fed91571defc3b8fb7fc7ed5a167c.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: (56 commits)
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
improve error reporting a bit more
improve error reporting
fix incorect condition
check if string to int conversions were done w/o errors
improve error reporting for unassigned grapheme/word/sentence break classes
avoid using of qunicodetables_p.h in generator
use QHash for line break map
use QHash for age map
...
Diffstat (limited to 'src/3rdparty')
| -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 |