summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0414-40/+244
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-302-0/+9
| |\
| | * Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-2312-35/+235
| |\
| | * Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| | * Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2212-35/+235
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-0115-3/+6514
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-0115-3/+6514
| |\ \ |/ / /
| * | hybrid heap improvement in the disabling of BTracemread2010-09-302-9/+1
| * | Further hybrid heap review changesmread2010-09-301-2/+1
| * | hybrid heap further review changesmread2010-09-303-18/+14
| * | lower case name for allocator support headermread2010-09-301-0/+0
| * | hybrid allocator integration review updatesmread2010-09-304-12/+14
| * | hybrid allocator tuningmread2010-09-302-1/+9
| * | removing need for u32std.h in s60mainmread2010-09-301-1/+2
| * | declaring fast allocation shrink hysteresis valuemread2010-09-301-0/+2
| * | fast allocator compiling for S60 3.2mread2010-09-304-4/+19
| * | moved fast allocator config to qt_hybridHeap_symbian_p.hmread2010-09-302-6/+6
| * | getting fast allocator to compile on S60 5.0 SDKmread2010-09-306-14/+110
| * | removing header use not in public SDKsmread2010-09-301-1/+5
| * | added header to arch.primread2010-09-301-1/+2
| * | added renamed headermread2010-09-301-0/+77
| * | new allocator tidy up and winscw freezemread2010-09-307-87/+13
| * | Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platformsmread2010-09-3015-3618/+5626
| * | Enable call stack tracing of allocs, for memory leak debuggingShane Kearns2010-09-303-21/+55
| * | Fix BTRACE loggingShane Kearns2010-09-302-112/+77
| * | Implement RNewAllocator::Available for Doug Lea sectionShane Kearns2010-09-302-7/+11
| * | Fill in some of the missing functionsShane Kearns2010-09-301-5/+24
| * | Fix bug where negative numbers are cast to unsigned and added as an offsetShane Kearns2010-09-301-1/+1
| * | Code cleanupShane Kearns2010-09-304-19/+22
| * | Add the new allocator to corelibShane Kearns2010-09-307-2/+4361
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-301144-2042/+2831
|\ \ \
| * | | QDeclarativeDebug: Make autotests more robustKai Koehne2010-09-304-13/+14
| * | | Add sendParentChangeNotification to QGraphicsItemMarco Bubke2010-09-302-4/+16
| * | | Use setParentItem() instead of setParentItemHelper if componentComplete is trueMarco Bubke2010-09-302-9/+34
| * | | QDeclarativeDebugClient: Make sure status is consistentKai Koehne2010-09-303-3/+8
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-301142-2030/+2776
| |\ \ \
| | * | | Revert "QDeclarativeDebugService: Add bc autotest" to get changes through sta...Joona Petrell2010-09-303-95/+2
| | * | | Doc clarification.Michael Brasser2010-09-301-0/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-292-181/+269
| | |\ \ \
| | | * | | Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4...Joona Petrell2010-09-292-181/+269
| | * | | | Fallback to A8 text rendering on Mac when LCD smoothing is disabledAaron Kennedy2010-09-291-0/+7
| | |/ / /
| | * | | Autotest that new "import Qt 4.7"s aren't added accidentallyAaron Kennedy2010-09-291-0/+57
| | * | | Document "import QtQuick 1.0" changeAaron Kennedy2010-09-292-0/+56
| | * | | Replace "import Qt 4.7" with "import QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-296-176/+132
| | |\ \ \
| | | * | | Correct property type of PathAttribute::value in the docs.Michael Brasser2010-09-291-1/+1
| | | * | | Remove unused AST node destructors.Michael Brasser2010-09-281-146/+3
| | | * | | Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-09-283-1/+26
| | | * | | Documentation.Michael Brasser2010-09-282-24/+98