summaryrefslogtreecommitdiffstats
path: root/examples/README
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-24 04:59:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-24 04:59:53 (GMT)
commit5b9173126253d6252eb09f8b34b707d28dbe1463 (patch)
tree434a513e7bb01808dba7b0f10bc5b52c79f51a72 /examples/README
parente5722f539888913b9bea4f91db95f5e2c5fceed1 (diff)
parentc5fa9ed38561a05325c798918e87549dd880af63 (diff)
downloadQt-5b9173126253d6252eb09f8b34b707d28dbe1463.zip
Qt-5b9173126253d6252eb09f8b34b707d28dbe1463.tar.gz
Qt-5b9173126253d6252eb09f8b34b707d28dbe1463.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: Abort open early if network session is in the process of openning. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for QTMOBILITY-253 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for MOBILITY-965 from Qt Mobility. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-853 from Qt Mobility. Cherry pick fix for MOBILITY-1047 from Qt Mobility. Merge bearermanagement changes from Qt Mobility. Cherry pick fix for MOBILITY-1031 from Qt Mobility. Cherry pick fix for MOBILITY-938 from Qt Mobility. Cherry pick fix for QTMOBILITY-240 from Qt Mobility. Make QtFontFamily::symbol_checked a bitfield.
Diffstat (limited to 'examples/README')
0 files changed, 0 insertions, 0 deletions