summaryrefslogtreecommitdiffstats
path: root/src/network/bearer/qnetworksession.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-25 10:13:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-25 10:13:32 (GMT)
commit03686225036ebfc5cf78e3fcc66f5810a140c7d2 (patch)
treee35bcaf151edb27b5e48fc989c6727039c397f5b /src/network/bearer/qnetworksession.h
parent194013d9db1b3e4ba6f56a864f3b64f523202948 (diff)
parent72599ca45c416f2f0a9654412c14a148ca3d728c (diff)
downloadQt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.zip
Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.tar.gz
Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Optimize QML "parent" property access Begin dragging PathView up to the level (quality and functionality) of other views. Rename qdeclarativetime -> qmltime Auto-test fix. Build Fix and port to new width and height properties Port Flickable and Flipable to support QGraphicsObject. Protect the QDeclarativeListProperty used in QGraphicsItem with ifdef Fix the build due to new properties in QGraphicsObject. Remove the children property from QDeclarativeItem. Rename qdeclarativetime -> qmltime Update AnchorChanges to use more natural form for setting anchors. Pen is not a creatable type. Begin dragging PathView up to the level (quality and functionality) of other views. Fix error reporting when symbian file copy fails. Stabilize QGraphicsEffect test on X11 QIODevice::read() and QFile::atEnd() performance improvements Clarified pkg_prerules usage documentation. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 ) Made it possible to define more than one language using pkg_prerules Symbian QAudioOutput::suspend() was resetting processedUSecs() to zero ...
Diffstat (limited to 'src/network/bearer/qnetworksession.h')
0 files changed, 0 insertions, 0 deletions