diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 11:01:50 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 11:01:50 +0200 |
commit | 892961bdb06199606ef92b3ab364175a1709c378 (patch) | |
tree | 73a1537f89fcd4fc91e36037f0882e008b8b99aa /src/network/access/access.pri | |
parent | c372896c5293633d75674a320a9b715a0501a42d (diff) | |
parent | c7bf2d79f37ac302dad9a5782645bd3f465bb47d (diff) |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (121 commits)
Fixed compile for symbian.
QDeclarativeDebug: Make autotests more robust
Add sendParentChangeNotification to QGraphicsItem
Use setParentItem() instead of setParentItemHelper if componentComplete is true
hybrid heap improvement in the disabling of BTrace
Further hybrid heap review changes
hybrid heap further review changes
lower case name for allocator support header
hybrid allocator integration review updates
hybrid allocator tuning
removing need for u32std.h in s60main
declaring fast allocation shrink hysteresis value
fast allocator compiling for S60 3.2
moved fast allocator config to qt_hybridHeap_symbian_p.h
getting fast allocator to compile on S60 5.0 SDK
removing header use not in public SDKs
added header to arch.pri
added renamed header
new allocator tidy up and winscw freeze
Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platforms
...
Diffstat (limited to 'src/network/access/access.pri')
0 files changed, 0 insertions, 0 deletions