summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Export qt_directfb_.* functions in plugin as wellAnders Bakken2010-09-173-5/+1
* Added autotest for QPixmap::size() with null pixmaps.Samuel Rødal2010-09-171-0/+5
* Update Symbian def files.Bjørn Erik Nilsen2010-09-171-2/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-175-31/+85
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-175-31/+85
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-165-31/+85
| | |\
| | | * QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBo...Bjørn Erik Nilsen2010-09-163-12/+45
| | | * Wrong bounding rect returned by QGraphicsEffect::boundingRect().Bjørn Erik Nilsen2010-09-163-20/+38
| | | * Compile on MacEskil Abrahamsen Blomfeldt2010-09-161-0/+3
| | | * Ensure building of WebKit and QtConcurrent are disabled with SunCC.Pierre Rossi2010-09-161-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-171-1/+1
|\ \ \ \
| * | | | Fixed compilation of qdrawhelper.cpp with XLC 10Rohan McGovern2010-09-161-1/+1
| | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-171-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Make SourceOver work properly in Qt/DirectFBAnders Bakken2010-09-161-1/+1
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-163-13/+15
|\ \ \ | |/ / |/| |
| * | Make dialcontrol.qml usable on highres capacitive screenAlessandro Portale2010-09-161-0/+1
| * | Make easing.qml usable on highres capacitive screenAlessandro Portale2010-09-161-7/+8
| * | Removing embarrassing trialing white spaces from former commitAlessandro Portale2010-09-161-6/+6
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-1610-43/+62
|\ \
| * | Check S60_VERSION instead of existence of certain files in bearer pluginMiikka Heikkinen2010-09-162-15/+15
| * | Fixed EPOCROOT references in createpackage.pl.axis2010-09-161-5/+8
| * | Restore 4.7.0 behavior that non-existing paths are possible.Thomas Zander2010-09-161-2/+3
| * | QTBUG-4852 Turning on runtime nested exception support where availablemread2010-09-162-0/+9
| * | Fix warningsThomas Zander2010-09-162-2/+2
| * | Fixed incorrect Symbian scoping.axis2010-09-161-2/+2
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-1639-210/+1564
| |\ \
| * | | QS60style: itemview selection indication works incorrectlySami Merila2010-09-161-17/+23
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-164-73/+174
|\ \ \ \
| * | | | Update QtDeclarative def filesJoona Petrell2010-09-162-1/+45
| * | | | Optimize FontLoader for "multi-use".Yann Bodson2010-09-162-72/+129
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-167-3272/+131
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update add libconninet version 0.45.Aaron McCarthy2010-09-1634-0/+6836
| * | | | Remove libconninet in preperation to updating it to version 0.45.Aaron McCarthy2010-09-1636-9977/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-161-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | doc: Fixed a \overloadThorbjørn Lindeijer2010-09-151-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-16298-502/+1272
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| * | | | Make test less sensitive to platform specificsBradley T. Hughes2010-09-161-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-15297-501/+1271
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-15290-5606/+13296
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-154-20/+126
| | | |\ \ \
| | | | * | | The test livelock of QTimer is now expected to workBenjamin Poulain2010-09-151-4/+1
| | | | * | | Make sure mapSelectionFromSource does not return a selection with invalid ran...Stephen Kelly2010-09-152-4/+51
| | | | * | | QEventDispatcherUnix: do not process too many timer if other events need to b...Olivier Goffart2010-09-152-12/+74
| | * | | | | Doc: Further QML improvements.David Boddie2010-09-155-22/+114
| | * | | | | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-153-7/+6
| | * | | | | Doc: Continued work on the QML documentation.David Boddie2010-09-144-18/+143
| | * | | | | Doc: More work on the QML documentation.David Boddie2010-09-14127-183/+327
| | * | | | | Doc: More work on the declarative API documentation.David Boddie2010-09-136-54/+123
| | * | | | | Doc: Some editing and tidying up.David Boddie2010-09-134-51/+13