summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2610-26/+53
|\
| * Handle layoutChanged() properly in QML views.Martin Jones2010-08-262-0/+9
| * Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7acMartin Jones2010-08-261-2/+0
| * Fix off-by-one at end when views scroll to keep currentItem visible.Martin Jones2010-08-262-13/+13
| * ListView.view and GridView.view properties should not be writable.Martin Jones2010-08-262-2/+2
| * Avoid Flickable view jumping when drag threashold is exceeded.Martin Jones2010-08-262-2/+9
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-261-2/+0
| |\
| | * Remove dead code.Michael Brasser2010-08-261-2/+0
| * | Fix ListView.view attached property with VisualItemModelMartin Jones2010-08-264-6/+22
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-251-3/+0
| |\
| | * Remove unused code.Michael Brasser2010-08-251-3/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-253-5/+64
| |\ \ | | |/
| * | Handle QAbstractItemModel layoutChanged() signalMartin Jones2010-08-251-0/+2
* | | Enabling AdvancedPointerEvents for active windows causes a panicSami Merila2010-08-253-3/+13
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-253-5/+64
|\ \ | |/ |/|
| * Remove enums from bitfield, since all compilers do not support them.Janne Anttila2010-08-251-4/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-242-1/+60
| |\
| | * Use QImage 'convertInPlace' versions in QVGPixmapData load functions.Jani Hautakangas2010-08-242-1/+60
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-258-46/+107
|\ \ \
| * | | Fix responseText to check the charset encoding field and also to notBea Lam2010-08-251-9/+78
| * | | Re-insert and emit the correct NOTIFY signals following the removalBea Lam2010-08-254-2/+8
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-251-15/+7
| |\ \ \
| * | | | Alignment of shadow for rich text is broken when using text stylesYann Bodson2010-08-251-3/+3
| * | | | typoYann Bodson2010-08-251-1/+1
| * | | | Setting one dimension of the sourceSize should set the other dimension.Yann Bodson2010-08-251-31/+17
| | |/ / | |/| |
* | | | Don't circumvent onDestruction handlers when clearing expression in delegate ...Martin Jones2010-08-253-4/+17
| |/ / |/| |
* | | Fix poor flicking behavior with slower flicks.Martin Jones2010-08-251-15/+7
|/ /
* | QDeclarativeDebug: send a message when new object are addedOlivier Goffart2010-08-245-2/+27
* | QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-243-9/+14
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-2410-35/+64
|\ \ | |/ |/|
| * Fix mispositioned text with QStaticText and OpenVG graphics systemEskil Abrahamsen Blomfeldt2010-08-241-2/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-08-24247-1377/+3284
| |\
| | * QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, ...Olivier Goffart2010-08-241-1/+3
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-246-18/+27
| | |\
| | | * Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itselfOlivier Goffart2010-08-231-8/+12
| | | * Fix assignment of a container included in the container itselfOlivier Goffart2010-08-235-10/+15
| * | | Use binarysort to find items.Gunnar Sletta2010-08-242-14/+29
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2413-62/+15
|\ \ \ \
| * | | | Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-2410-12/+12
| | |/ / | |/| |
| * | | Fix PathView when setting an empty model that is later filled.Michael Brasser2010-08-241-1/+2
| * | | QDeclarativeVisualItemModel code cleanup.Michael Brasser2010-08-242-49/+1
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-233-3/+8
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-231-1/+1
| |\ \
| | * | Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-231-1/+1
| * | | On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible.Jani Hautakangas2010-08-231-0/+5
| * | | QWidget metadata has not been set up yet in QWidgetPrivate::init.Jani Hautakangas2010-08-231-2/+2
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2327-113/+584
|\ \ \ | |/ /
| * | bindTexture: Replace texture if painting is active on pixmap/imageAndreas Kling2010-08-211-5/+18
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-201-4/+2
| |\ \
| | * | QDeclarativeDebug: stream all the context, including the internals ones.Olivier Goffart2010-08-201-4/+2