diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 15:46:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 15:46:03 (GMT) |
| commit | 679a545cb805382c97582dffa3fda4dbc438c81f (patch) | |
| tree | f6ea9a9bd36b8636f0c5d5bf956c82a2ea81c391 /src/dbus/qdbusintegrator.cpp | |
| parent | a6a8bee86f7e13d49d9115eb33aaee999bd15ad5 (diff) | |
| parent | 6d331b6ee7711cde2bf9adc1a584a45875c07983 (diff) | |
| download | Qt-679a545cb805382c97582dffa3fda4dbc438c81f.zip Qt-679a545cb805382c97582dffa3fda4dbc438c81f.tar.gz Qt-679a545cb805382c97582dffa3fda4dbc438c81f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Designer: Block QEvent::WinIdChange.
QUrl::setUrl should call detach
qkeymapper_x11.cpp: fix compilation with LSB and without XKB
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
0 files changed, 0 insertions, 0 deletions