diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 05:20:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 05:20:47 (GMT) |
| commit | 60c195a1865e06026b54a5d8fd0036aaa010b8bc (patch) | |
| tree | efc90717e8107f06d6eda5e3d864d64eb2e43c0e /src/opengl | |
| parent | 80c2e1211065f606c6f39e708a74afad1c624663 (diff) | |
| parent | 44ac0a7ff72c94e7b417da18766ad1578b97b4b0 (diff) | |
| download | Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.zip Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.tar.gz Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.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:
apply msvc flags to wince too
fix qt static build on wince
fix build with QT_NO_GESTURES
qmake: fix quoting of moc calls
Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar
Regenerate the Unicode tables after updates to the generator tool
Compile in C++0x mode
remove extra includes
minor clean-ups
minor improvements for data parsers
tiny clean-up for generated data
move QUnicodeTables:: script() and lineBreakClass() implementations
make lupdate test less fragile
Enable building Qt/Webkit with debug symbols
Add breakpad support
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index bfb232d..f3a4c95 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -54,6 +54,7 @@ #include <private/qt_x11_p.h> #include <private/qpixmap_x11_p.h> #include <private/qimagepixmapcleanuphooks_p.h> +#include <private/qunicodetables_p.h> #ifdef Q_OS_HPUX // for GLXPBuffer #include <private/qglpixelbuffer_p.h> |