summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-0/+3
|\
| * Workaround webkit deadlock on macos xShane Kearns2011-06-221-0/+3
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-211-7/+14
|\ \
| * | QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-201-7/+14
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-17108-1880/+1239
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-06-142-20/+2
| |\ \ \
| | * \ \ Merge remote branch 'upstream/4.8'Thierry Bastian2011-05-26458-7904/+7877
| | |\ \ \
| | * \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-05-19105-152/+7190
| | |\ \ \ \
| | * | | | | Remove more inconsistencies with invisible.Frederik Gladhorn2011-05-191-18/+0
| | * | | | | QAccessibleToolButton::text should return accessibleName if set.Frederik Gladhorn2011-05-051-1/+1
| | * | | | | Remove stray semicolon.Frederik Gladhorn2011-05-051-1/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-0957-324/+276
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | DeclarativeObserver: Don't fade in the highlight edgeThorbjørn Lindeijer2011-05-302-58/+10
| | * | | | | Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-3057-264/+264
| | * | | | | DeclarativeObserver: Fixed duplicates in item selectionThorbjørn Lindeijer2011-05-251-2/+2
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-081-6/+107
| |\ \ \ \ \ \
| | * | | | | | Ammend last commitHarald Fernengel2011-06-061-1/+1
| | * | | | | | Implemented QAccessibleTextEdit::attributes()José Millán Soto2011-06-061-5/+106
| | * | | | | | Changing cursor position in all boundariesJosé Millán Soto2011-06-061-1/+1
| | |/ / / / /
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-085-140/+313
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-081-0/+1
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-081-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Update internal state before emitting configurationChanged() signals.Xizhi Zhu2011-06-081-0/+1
| | * | | | | | | Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-0814-545/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-3/+12
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-301-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixed contains check casing in mmf.pro fileTomi Vihria2011-05-301-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-263-6/+23
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-2/+10
| | | | * | | | | | | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-253-6/+15
| | * | | | | | | | | Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-2714-768/+61
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-251-0/+6
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-251-0/+6
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | / / / / | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Fix the state of default network configuration.Xizhi Zhu2011-05-241-0/+6
| | * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-244-147/+304
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-191-2/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Fix brush transform in QtDirectFB backend, fixing QTBUG-18577Denis Oliver Kropp2011-05-191-2/+2
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-192-137/+299
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | directfb: Paint engine enhancementsDenis Oliver Kropp2011-05-192-137/+299
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-183-15/+6
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-183-15/+6
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-0827-87/+490
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06482-7252/+13053
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Fix the wayland windowsurface so that we have stencil and depth bufferJørgen Lind2011-05-301-1/+1
| | * | | | | | | | We need to let the currentContext be in the same state afterJørgen Lind2011-05-301-1/+8
| | * | | | | | | | Track Wayland changesPaul Olav Tvete2011-05-303-3/+40
| | * | | | | | | | Fix deadlocks in wayland clipboard that can occur in special scenarios.Laszlo Agocs2011-05-302-10/+24
| | * | | | | | | | Prevent crash in wayland mimedata in case there is no offer.Laszlo Agocs2011-05-301-0/+2
| | * | | | | | | | Remove const from QPlatformClipboard::mimeData().Laszlo Agocs2011-05-304-9/+7
| | * | | | | | | | Retrieve the actual data in the Wayland clipboard only when requested.Laszlo Agocs2011-05-302-23/+69