summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-048-3/+143
|\
| * Fix insert and scroll to bottom casemae2011-04-261-0/+5
| * Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-14528-71482/+32955
| |\
| * | QDeclarativeDebug: Handle case where client with ongoing queries is deletedKai Koehne2011-03-301-0/+46
| * | Merge ../qt-qml-stagingYann Bodson2011-03-2969-394/+777
| |\ \
| * | | Remove compile warningAlan Alpert2011-03-241-1/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-23295-2271/+13511
| |\ \ \
| * | | | Fix QUnifiedTimer bugAlan Alpert2011-03-232-1/+8
| * | | | Stop the animation driver when there are no more animations.Michael Brasser2011-03-162-1/+5
| * | | | Optimization and benchmark for setting object properties from QML.Michael Brasser2011-03-161-0/+27
| * | | | Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-16339-1844/+6985
| |\ \ \ \
| * | | | | Add Constant and Final flags to QMetaObjectBuilderBea Lam2011-03-142-1/+60
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-01151-623/+2611
| |\ \ \ \ \
| * | | | | | Fixed QML TextEdit docsThiago Marcos P. Santos2011-02-251-1/+0
* | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-041-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-031-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-031-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-031-1/+1
* | | | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-05-0430-133/+318
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove warningsJørgen Lind2011-05-033-1/+3
| * | | | | | | | | | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-035-50/+26
| * | | | | | | | | | wayland: Track wayland changesKristian Høgsberg2011-04-285-21/+12
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-28271-10671/+23902
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Support GL ES 2 with uikit.con2011-04-276-43/+101
| * | | | | | | | | | | Lighthouse: Fix virtual desktopwidgetJørgen Lind2011-04-202-9/+4
| * | | | | | | | | | | Added missing function in QWaylandWindow.Samuel Rødal2011-04-191-0/+3
| * | | | | | | | | | | wayland: Drop a debug qWarning()Kristian Høgsberg2011-04-191-3/+0
| * | | | | | | | | | | wayland: Discard motion and button events receive with a NULL pointer focusKristian Høgsberg2011-04-191-0/+18
| * | | | | | | | | | | wayland: Include eglconvenience.pri instead of pulling in individual fileKristian Høgsberg2011-04-191-5/+4
| * | | | | | | | | | | wayland: Remove unused EGLConfig fieldKristian Høgsberg2011-04-191-1/+0
| * | | | | | | | | | | wayland: Add native access interface for Wayland pluginKristian Høgsberg2011-04-195-0/+144
| * | | | | | | | | | | Compile fix for QPA's session manager.con2011-04-181-0/+2
| * | | | | | | | | | | Fixes compilation of wayland plugin after latest changes in wayland.Samuel Rødal2011-04-181-0/+1
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-031-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix drawing text in item view:Olivier Goffart2011-05-031-0/+21
* | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-037-80/+191
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | / / / / / / / / / | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-037-80/+191
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-022-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-022-2/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | | | * | | | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-1/+1
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-05-025-79/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-05-025-79/+190
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Revert "Fix double painting when adding an item into a linear layout"Jan-Arve Sæther2011-04-281-4/+1
| | | | * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7Thierry Bastian2011-04-20236-2069/+7050
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Revert "Fixed a crash in QListView"Thierry Bastian2011-04-191-1/+1
| | | | * | | | | | | | | | | | Avoid flicker when invalidate is propagated in a widget/layout hierarchyJan-Arve Sæther2011-04-145-76/+190
| | | | * | | | | | | | | | | | Do not call setSizePolicy from ctor, it might call a virtual functionJan-Arve Sæther2011-04-141-2/+2
| | | | * | | | | | | | | | | | Fixed a crash in QListViewThierry Bastian2011-04-111-1/+1
* | | | | | | | | | | | | | | | Fix compilationOlivier Goffart2011-05-031-1/+0