diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-27 02:09:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-27 02:09:39 (GMT) |
| commit | 53e77aace976b5c908ea71f15146ccb575fb1cc5 (patch) | |
| tree | c4836665d94e9156c6a502cef1e2a63d288fe025 /src/opengl | |
| parent | 59c58576efd3ceff7add46a359fd99e56a2fb279 (diff) | |
| parent | 15866a4436814da5da9348a8c930ee1d826ecb9a (diff) | |
| download | Qt-53e77aace976b5c908ea71f15146ccb575fb1cc5.zip Qt-53e77aace976b5c908ea71f15146ccb575fb1cc5.tar.gz Qt-53e77aace976b5c908ea71f15146ccb575fb1cc5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits)
Make symbian/unix shadow builds work again.
Change the files to camelcase as avkon now does that
Update EABI and WINSCW DEF files for Symbian
Fix linking on arm with def files
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936
Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.
Fixed make runonphone that looked for the package in the wrong place.
Fixed several problems with the postlinker for Symbian (elf2e32).
Don't crash when cleaning the uninitialized fontdatabase (Symbian)
Revert "Fixing the race condition in event dispatcher implementation on"
Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path"
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Fixed memory restrictions not being passed on to elf2e32.
Allow TLW translucency on Symbian without Qt::FramelessWindowHint
Updated UIDs for spectrum demo
Ensure that compiling with the no debug/warning output defines works
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
Clean up HB_Anchor's DeviceTables on failure when loading format 3
Make sure ValueRecord's DeviceTables are cleaned up on failure
...
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 1727a41..cd5dbbe 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -86,7 +86,7 @@ QT_BEGIN_INCLUDE_NAMESPACE QT_END_INCLUDE_NAMESPACE # ifdef old_qDebug # undef qDebug -# define qDebug QT_QDEBUG_MACRO +# define qDebug QT_NO_QDEBUG_MACRO # undef old_qDebug # endif class QMacWindowChangeEvent; |