diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 11:32:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 11:32:44 (GMT) |
| commit | 2268c602cacc7efe5fa54dd026d1c3455ec76c47 (patch) | |
| tree | eb20d0ed94af1756c70e55425f011fd228ff3b97 /src/corelib | |
| parent | a847edefd9e2efd70e63935965624354406f932d (diff) | |
| parent | 48656520b76abe76c114fce4b466360e7e2f628f (diff) | |
| download | Qt-2268c602cacc7efe5fa54dd026d1c3455ec76c47.zip Qt-2268c602cacc7efe5fa54dd026d1c3455ec76c47.tar.gz Qt-2268c602cacc7efe5fa54dd026d1c3455ec76c47.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My changes for 4.7.0.
fixed QDBUS export error
Q_INVOKABLES added to Qt-DBus
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions