summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change default TapAndHold timeout and make configurableThomas Zander2010-07-084-4/+36
* Avoid unneeded additionThomas Zander2010-07-081-2/+2
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0832-935/+250
|\
| * 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
| | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0716-463/+299
| | |\ \ \
| * | | | | Doc: documenting docsMorten Engvoldsen2010-07-081-1/+1
| | |_|_|/ | |/| | |
| * | | | Doc: more cleaningMorten Engvoldsen2010-07-081-24/+3
| * | | | Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| * | | | Doc: cleaning html generatorMorten Engvoldsen2010-07-081-26/+0
| * | | | Doc: changing index pageMorten Engvoldsen2010-07-084-856/+62
* | | | | Doc: fixing style from 600 to bold weightMorten Engvoldsen2010-07-081-8/+7
|/ / / /
* | | | Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
* | | | Doc: adding HTML class names and style docs to the generatorMorten Engvoldsen2010-07-081-32/+34
* | | | Doc: Fixing typo - background file nameMorten Engvoldsen2010-07-081-1/+1
* | | | Doc: Fixing broken linkMorten Engvoldsen2010-07-081-1/+1
* | | | Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
* | | | Doc: fixing typosMorten Engvoldsen2010-07-082-3/+3
| |_|/ |/| |
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-089-36/+78
|\ \ \
| * | | SSL backend: load libraries for certificates only oncePeter Hartmann2010-07-073-29/+30
| * | | immediately set function context when entering a namespaceOswald Buddenhagen2010-07-073-1/+46
| * | | Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-072-3/+2
| * | | Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default valueAdrian Constantin2010-07-071-3/+0
* | | | qdoc: Fixed table of contents for namespace pages.Martin Smith2010-07-081-1/+2
|/ / /
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0725-232/+164
|\ \ \
| * | | Simplify *= to += after contains() testMark Brand2010-07-078-14/+14
| * | | Consolidate sql driver configuration redundancyMark Brand2010-07-0720-221/+126
| * | | Fixed whitespace formattingMark Brand2010-07-079-9/+9
| * | | run dep commands in build dirOswald Buddenhagen2010-07-075-2/+29
* | | | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-075-20/+14
|/ / /
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-074-2/+83
|\ \ \
| * | | Add missing API shimsKent Hansen2010-07-073-0/+39
| * | | I18n: Complete German translation for 4.7.0Friedemann Kleint2010-07-071-2/+44
* | | | qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-072-234/+1
|/ / /