summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-276-99/+114
|\
| * 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-2 into 4.7David Boddie2010-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
* | Doc: Corrected the documentation about the compression threshold.David Boddie2010-05-261-19/+21
|/
* 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2610-170/+179
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-2692-170/+843
| |\ \ | | |/
| | * Mention TextInput/Edit::selectByMouse property in QmlChanges.Martin Jones2010-05-253-2/+3
| | * Add inherits Item to TextEdit and TextInput docs.Martin Jones2010-05-252-2/+4
| * | Clean up and don't allow clicks on already filled placesBea Lam2010-05-243-139/+149
| * | Clean up project files for c++ examplesBea Lam2010-05-244-28/+23
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-251-7/+3
|\ \ \
| * | | Doc: Removed a misleading sentence about signals.David Boddie2010-05-251-7/+3
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2557-101/+278348
|\ \ \ \
| * | | | Fix compilation of qegl.cpp after the last mergeThiago Macieira2010-05-251-1/+2
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2557-102/+278348
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-244-35/+84
| | |\ \ \ \
| | | * | | | Fix a race condition with QtDBus blocking for replies.Thiago Macieira2010-05-244-34/+83
| | | * | | | QtDBus: Debug message updateThiago Macieira2010-05-241-1/+1
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-213-14/+19
| | |\ \ \ \ \
| | | * | | | | Removed DEPLOYMENT from demos/spectrum/spectrum.proGareth Stockwell2010-05-211-13/+0
| | | * | | | | Install source for spectrum demoGareth Stockwell2010-05-213-0/+18
| | | * | | | | Fixed path for copying launcher script for spectrum demoGareth Stockwell2010-05-211-1/+1
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-213-15/+88
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-213-15/+88
| | | |\ \ \ \ \
| | | | * | | | | Fixed an assert in QMenuThierry Bastian2010-05-212-11/+55
| | | | * | | | | Call eglTerminate() when the last QEglContext is destroyed to free mem.Trond Kjernåsen2010-05-211-4/+33
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-2143-17/+278235
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |