diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 14:23:10 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 14:23:10 (GMT) |
commit | 846ef61e628e0eef23db43b3e4e6b247a0d18c17 (patch) | |
tree | 2c392632eae3f830833173cf42015023718e1daa /src/gui/egl | |
parent | 3108e5991abf2bff88ddf160baa3e955c956e155 (diff) | |
parent | 6179db13b19b7b5e36b51abbb2cf8cb83f9f09d3 (diff) | |
download | Qt-846ef61e628e0eef23db43b3e4e6b247a0d18c17.zip Qt-846ef61e628e0eef23db43b3e4e6b247a0d18c17.tar.gz Qt-846ef61e628e0eef23db43b3e4e6b247a0d18c17.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QSystemTrayIcon: put WinCE specific code into qsystemtrayicon_wince.cpp
Windows CE: fix multiple QAction::triggered() signals
Diffstat (limited to 'src/gui/egl')
0 files changed, 0 insertions, 0 deletions