diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-21 13:52:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-21 13:52:54 (GMT) |
| commit | b7b38acaccc28f984eb52bd808e1cf8c097af840 (patch) | |
| tree | 7e8e50fca0bb5b7635403e7d121ee619153d49db /src/gui/widgets/qmenudata.h | |
| parent | e22d40a6143709da6ee26c2f8e1b6a05904fd9b4 (diff) | |
| parent | 85682eeaa70fb57200c119bfded021174c820180 (diff) | |
| download | Qt-b7b38acaccc28f984eb52bd808e1cf8c097af840.zip Qt-b7b38acaccc28f984eb52bd808e1cf8c097af840.tar.gz Qt-b7b38acaccc28f984eb52bd808e1cf8c097af840.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
Diffstat (limited to 'src/gui/widgets/qmenudata.h')
0 files changed, 0 insertions, 0 deletions