diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:38:22 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:38:22 (GMT) |
| commit | be25f9e17eac2b99d83951dbc0bd1b6e09d91e57 (patch) | |
| tree | e10e3bade3973f66907e3152daeb4fc6cfe247a8 /src/gui/kernel/qeventdispatcher_qpa_p.h | |
| parent | 33db4e2533b3e4e07d37b651b65491195be403ab (diff) | |
| parent | f6909d47b981720cb87cb96454cdf9ea493383ee (diff) | |
| download | Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.zip Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.tar.gz Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.tar.bz2 | |
Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7
Conflicts:
src/gui/styles/qs60style.cpp
Diffstat (limited to 'src/gui/kernel/qeventdispatcher_qpa_p.h')
0 files changed, 0 insertions, 0 deletions