summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' into fridayMorten Engvoldsen2010-09-17362-4120/+3252
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16356-4102/+3214
| |\
| | * 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
| | | | * | | | | Doc: Added a missing file.David Boddie2010-09-131-0/+193
| | | | * | | | | Doc: Fixed text in license headers.David Boddie2010-09-13149-147/+227
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-162-126/+240
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Provide a way to compile with RVCT 4.0 using generated Makefile.Miikka Heikkinen2010-09-162-126/+240
| | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1636-70/+1312
| | |\ \ \ \ \ \
| | | * | | | | | Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| | | * | | | | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-164-10/+134
| | | * | | | | | Fix test.Michael Brasser2010-09-161-2/+0
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1531-59/+1179
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-153-8/+11
| | | | * | | | | Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39Thomas Hartmann2010-09-152-0/+98
| | | | * | | | | Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-0/+2
| | | | * | | | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-09-152-4/+8
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1522-59/+1075
| | | | | |\ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | * | | | | | Add missing images for dynamiclist example.Yann Bodson2010-09-155-0/+0
| | | | | |/ / / / | | | | |/| | | |