summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/cppcodeparser.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-28 17:49:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-28 17:49:53 (GMT)
commit54155c773c7a879d967e577e1d24ce828850c90a (patch)
tree76c6d5d8b82e7d074b7869af1b84e4b5f78b37d4 /tools/qdoc3/cppcodeparser.cpp
parent4bd7a5df86f1292ad2acaa16a9e9c493c94a9c79 (diff)
parent07f5dd83dcb5430433fa6d7139298d5a9cd11276 (diff)
downloadQt-54155c773c7a879d967e577e1d24ce828850c90a.zip
Qt-54155c773c7a879d967e577e1d24ce828850c90a.tar.gz
Qt-54155c773c7a879d967e577e1d24ce828850c90a.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: (33 commits) Fix build with def files on arm Build fix for src/plugins/phonon/mmf 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 ...
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
0 files changed, 0 insertions, 0 deletions