diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 12:00:24 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 12:00:24 (GMT) |
commit | e5935fb92f89ab88daa0060465e665a626bfa88b (patch) | |
tree | 3b37aa23916d815f663a0cfb638b2bb66468731c /mkspecs/wince50standard-armv4i-msvc2005/qmake.conf | |
parent | f11568e805def983af96b6e697094df1fb96af15 (diff) | |
parent | 7ae5285132db6c435e91ab097f41097217d68a2c (diff) | |
download | Qt-e5935fb92f89ab88daa0060465e665a626bfa88b.zip Qt-e5935fb92f89ab88daa0060465e665a626bfa88b.tar.gz Qt-e5935fb92f89ab88daa0060465e665a626bfa88b.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
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
Diffstat (limited to 'mkspecs/wince50standard-armv4i-msvc2005/qmake.conf')
0 files changed, 0 insertions, 0 deletions