summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-278-102/+146
|\
| * Wrong QGraphicsItem::childrenBoundingRect() when applying effects.Bjørn Erik Nilsen2010-05-272-3/+32
| * Fix a bug in QDirectFBPixmapData::fromImageAnders Bakken2010-05-272-16/+11
| * Replace memmove with memcpyEskil Abrahamsen Blomfeldt2010-05-271-6/+6
| * Fixed compilation of QtOpenGL.Samuel Rødal2010-05-272-2/+2
| * Optimize initialization of QStaticTextEskil Abrahamsen Blomfeldt2010-05-272-81/+101
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-277-7/+52
|\ \
| * | Remove superfluous forward declaration.kh12010-05-271-3/+0
| * | Update documentation for the -font command line optionBradley T. Hughes2010-05-271-1/+2
| * | Fixed a crash when creating QGtkStyle before QApplicationJens Bache-Wiig2010-05-272-2/+2
| * | Added support for Indonesian language on Symbian.Denis Dzyubenko2010-05-271-1/+2
| * | Ensure that activation object has been created before popping scope of native...Kent Hansen2010-05-272-0/+46
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2720-89/+321
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-27130-391/+279302
| |\ \ \
| | * | | If a pathview delegate changes size, reposition center on pathMartin Jones2010-05-275-6/+46
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-26120-358/+279251
| | |\ \ \
| | * | | | Remove deprecated Flickable::overshoot property.Martin Jones2010-05-262-24/+0
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-267-166/+172
| | |\ \ \ \
| | * | | | | Don't display unnecessary copyright headers in docMartin Jones2010-05-267-10/+10
| * | | | | | Improve QML framerate debuggingAaron Kennedy2010-05-276-49/+265
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-27181-1433/+2409
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-2770-259/+1045
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-264-1/+98
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Redraw issues when removing a fully transparent QGraphicsItem from the scene.Bjørn Erik Nilsen2010-05-262-0/+61
| * | | | | | Fixes a proxymodel sorting odity.Pierre Rossi2010-05-262-1/+37
|/ / / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-264-8/+47
|\ \ \ \ \ \
| * | | | | | tst_qxmlstream: fix in shadowbuildOlivier Goffart2010-05-262-6/+8
| * | | | | | QXmlStreamWriter: Auto-formatting does not behave properly with processing in...Jakub Wieczorek2010-05-262-1/+19
| * | | | | | Update the state of the keyboard modifiers on drop events.David Faure2010-05-261-1/+20
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2662-250/+900
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2662-250/+900
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Doc fixes, improvementsBea Lam2010-05-267-77/+72
| * | | | | | Allow js files with '.pragma library' to be used from WorkerScriptBea Lam2010-05-268-29/+77
| * | | | | | Add more examples of XPath expressions to XmlRole.Bea Lam2010-05-263-10/+118
| * | | | | | Open input panel on press if TextInput or TextEdit are already focused but pa...Joona Petrell2010-05-264-0/+28
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2639-263/+666
| |\ \ \ \ \ \
| | * | | | | | Fix horizontal/verticalCenter anchors bug.Yann Bodson2010-05-264-18/+43
| | * | | | | | Fix for qml reloaded in qml viewer not being maximized properly on a deviceJoona Petrell2010-05-261-1/+3
| | * | | | | | Unify naming of import plugin targetsJoona Petrell2010-05-2619-26/+37
| | * | | | | | Add a way to control when software input panels are shown in TextInput and Te...Joona Petrell2010-05-268-52/+413
| | | |_|/ / / | | |/| | | |
| | * | | | | Replace QTime with QElapsedTimerAaron Kennedy2010-05-261-2/+2
| | * | | | | Fix Gradient doc snippet.Yann Bodson2010-05-262-5/+3
| | | |_|_|/ | | |/| | |
| * | | | | Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".Warwick Allison2010-05-2611-30/+104
| | |_|_|/ | |/| | |
| | | | * escape quotes meant for the shellOswald Buddenhagen2010-05-261-1/+1
| | | | * escape backslashesOswald Buddenhagen2010-05-2656-142/+142
| | | | * complain about unescaped backslashesOswald Buddenhagen2010-05-262-0/+7
| | | | * qaccessibility::eventTest(...) was failing.Carlos Manuel Duclos Vergara2010-05-261-1/+1
| | | | * qdoc: Fixed the French version of the address book tutorialMartin Smith2010-05-261-23/+7
| | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-26142-464/+279266
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-26119-1140/+2140
| | | | | |\ | |_|_|_|/ / |/| | | | |