diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-21 18:28:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-21 18:28:49 (GMT) |
| commit | e575816cd618841e90e8933ff52e40a8581d3328 (patch) | |
| tree | 28bc5c60b165be6986bc73e10c3b089f3468f62b /src/gui/kernel/qt_s60_p.h | |
| parent | 2ae6b44e4242c60bd882661e104bb53fa6670556 (diff) | |
| parent | 6ff74c0d058b88dca30261158deaad49a8b981cb (diff) | |
| download | Qt-e575816cd618841e90e8933ff52e40a8581d3328.zip Qt-e575816cd618841e90e8933ff52e40a8581d3328.tar.gz Qt-e575816cd618841e90e8933ff52e40a8581d3328.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Update symbian def files
Merge from upstream
Merge from upstream
Fix pro file error affecting windows builds
Merge TRK client changes from upstream (QtCreator)
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
0 files changed, 0 insertions, 0 deletions