diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-29 11:14:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-29 11:14:32 (GMT) |
| commit | 7b18baf23b1e8c663872b2b25b1323798b1d09df (patch) | |
| tree | 6d8d6a1f67e955da6816ce606888ef2fa8cfc932 /src/corelib/statemachine/qhistorystate.cpp | |
| parent | 53f16164661f8692aef9bd941b92697a047c0f4c (diff) | |
| parent | 6d8f350808d36aac807cd55eafc447e80af671ad (diff) | |
| download | Qt-7b18baf23b1e8c663872b2b25b1323798b1d09df.zip Qt-7b18baf23b1e8c663872b2b25b1323798b1d09df.tar.gz Qt-7b18baf23b1e8c663872b2b25b1323798b1d09df.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Unix configure: Add support for --sysroot
Add a 'capabilities' flag to the marshaller and demarshaller
Add a set of connection capabilities to QDBusConnection
Move the main D-Bus session and system connections to the main thread
Add a way to obtain the DBusConnection* pointer from a QDBusConnection
Make the QIconvCodec on Unix not enforce the Latin1 codec.
Diffstat (limited to 'src/corelib/statemachine/qhistorystate.cpp')
0 files changed, 0 insertions, 0 deletions