summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0912-61/+68
|\
| * doc: Fixed several qdoc warnings.Martin Smith2010-07-092-3/+3
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-093-36/+36
| |\
| | * SSL library loading: load system libs only oncePeter Hartmann2010-07-091-16/+17
| | * Revert "SSL backend: load libraries for certificates only once"Peter Hartmann2010-07-093-30/+29
| * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+6
| |/
| * doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+1
| * doc: Fixed several qdoc warnings.Martin Smith2010-07-091-2/+2
| * doc: Fixed several qdoc warnings.Martin Smith2010-07-092-2/+3
| * doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+2
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-093-2/+18
| |\
| * | doc: Fixed several qdoc warnings.Martin Smith2010-07-093-15/+15
* | | Doc: fixing examples linkMorten Engvoldsen2010-07-091-1/+1
| |/ |/|
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-094-15/+23
|\ \ | |/
| * doc: Fixed last of the declarative/QML qdoc warnings.Martin Smith2010-07-094-15/+23
* | Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-093-2/+18
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-091-2/+4
|\
| * qhelpgenerator: Fix namespace syntax checking.ck2010-07-091-2/+4
* | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-093-34/+33
|/
* Corrected pathsMark Brand2010-07-081-2/+2
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-082-2/+2
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0836-59/+424
| |\
| * | qdoc: Fixed broken QML property links.Martin Smith2010-07-082-2/+2
* | | Doc: Correcting img bugMorten Engvoldsen2010-07-081-1/+0
| |/ |/|
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-087-14/+296
|\ \
| * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-085-6/+38
| |\ \
| | * | Change default TapAndHold timeout and make configurableThomas Zander2010-07-084-4/+36
| | * | Avoid unneeded additionThomas Zander2010-07-081-2/+2
| * | | Doc: changing offline styleMorten Engvoldsen2010-07-081-0/+251
| |/ /
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0832-935/+250
| |\ \
| * | | Doc: fixing style from 600 to bold weightMorten Engvoldsen2010-07-081-8/+7
* | | | Doc: change on index pageMorten Engvoldsen2010-07-081-1/+1
| |/ / |/| |
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0828-43/+199
|\ \ \
| * | | Build Qt with option -Zc:wchar_t under MSVCliang jian2010-07-083-3/+3
| * | | Fix compilation when QT_NO_IM is definedTasuku Suzuki2010-07-083-1/+8
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0863-1473/+534
| |\ \ \
| | * | | fix build with sqlite2Oswald Buddenhagen2010-07-081-2/+2
| | * | | respect UI_DIR when creating image collectionsOswald Buddenhagen2010-07-081-6/+6
| | | |/ | | |/|
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-087-894/+54
| | |\ \
| | * | | doc: Added doc for accessing views and models from delegates.Martin Smith2010-07-081-0/+73
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0819-31/+107
| |\ \ \ \
| | * | | | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| | * | | | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| | * | | | MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2
| | * | | | Fixed crash which occurs when switching between video clipsGareth Stockwell2010-07-072-13/+32
| | * | | | Close media clip before creating new player objectGareth Stockwell2010-07-075-1/+9
| | * | | | Enable bufferStatus signal during video clip loading on NGA platformsGareth Stockwell2010-07-072-2/+2
| | * | | | Prevent crash when video is played without a VideoWidgetGareth Stockwell2010-07-073-4/+18
| | * | | | Add partial update deployment rules to QtNetworkShane Kearns2010-07-071-0/+15
| | * | | | Fix crash when handleCommand() called before softkeys are updatedJason Barron2010-07-072-1/+6
| |/ / / /