summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-2714-768/+61
|\
| * DeclarativeObserver: Removed the SubcomponentEditorToolThorbjørn Lindeijer2011-05-2411-697/+17
| * Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-24484-8573/+13915
| |\
| * | Pass QList as const reference when possibleThorbjørn Lindeijer2011-05-173-8/+10
| * | Fixed crashes in Observer mode related to infinite bounding rectsThorbjørn Lindeijer2011-05-173-67/+38
* | | 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 remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-20258-4397/+4399
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-191-1/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-05-181-1/+3
| | |\ \ \ \
| | | * | | | Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII...Simon Hausmann2011-05-161-1/+3
| * | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-183-4/+20
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13458-7827/+7827
| | |/ / / / | |/| | | |
* | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-17201-3433/+3433
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17198-3380/+3380
| |\ \ \ \
| | * | | | Update licenseheader text in source filesJyri Tahtela2011-05-13198-3380/+3380
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-161-2/+2
| |\ \ \ \ \
| | * | | | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
* | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1680-24/+6857
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-1265-5/+6490
| |\ \ \ \ \ \
| | * | | | | | QmlDebug: Fix QmlOstPlugin compilation failureKai Koehne2011-05-121-2/+2
| | * | | | | | QmlDebug: Fix QmlOstPlugin compilation failureTom Sutcliffe2011-05-114-2/+51
| | * | | | | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-10139-1341/+6255
| | |\ \ \ \ \ \
| | * | | | | | | Enable performance monitoring at application startup.Kai Koehne2011-05-102-1/+14
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fixed license headerThorbjørn Lindeijer2011-05-051-8/+16
| | * | | | | | Fixed compile on WindowsThorbjørn Lindeijer2011-05-041-1/+1
| | * | | | | | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-0461-2/+6417
| * | | | | | | Remove not supported qmake apiJørgen Lind2011-05-093-6/+0
| * | | | | | | Added Wayland selection support.Laszlo Agocs2011-05-095-0/+334
| * | | | | | | Added Wayland selection support.Laszlo Agocs2011-05-096-3/+24
| * | | | | | | Add the wayland client libraries to rpath if we use rpathJørgen Lind2011-05-091-0/+4
| * | | | | | | Fix the wayland windowsurface so that we have stencil and depth bufferJørgen Lind2011-05-091-1/+1
| * | | | | | | Dont do doneCurrent in swapBuffersJørgen Lind2011-05-051-1/+0
| * | | | | | | Lighthouse: Fix up XlibJørgen Lind2011-05-055-14/+10
| * | | | | | | Merge remote-tracking branch 'origin/4.8' into lighthouse-masterJørgen Lind2011-05-043-21/+35
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-113-4/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-102-2/+18
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-2/+18
| | | |_|_|/ | | |/| | |
| * | | | | Fix -no-guiBernhard Rosenkraenzer2011-05-091-2/+2
| |/ / / /
* | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-05-0425-123/+310
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Remove warningsJørgen Lind2011-05-031-0/+1
| * | | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-035-50/+26