summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-0215-79/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0115-79/+209
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-12-0160-341/+1663
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-3060-341/+1663
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-295-13/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-295-13/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-291-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Fix documentation for QML extended typesCaio Marcelo de Oliveira Filho2010-11-291-2/+2
| * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-282-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-282-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-2730-229/+325
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2730-229/+325
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-2628-217/+978
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2628-217/+978
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-25196-1442/+17573
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-25143-1340/+6082
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2456-102/+11491
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-11-2318-127/+855
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2313-24/+529
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fix filtering of columns in QSFPM.Stephen Kelly2010-11-233-4/+44
* | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-092-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-12-0922-78/+308
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | QT::Window palette brush fails to render correctly.Jani Hautakangas2010-12-091-2/+1
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Prevent out-of-bounds memory access in drawhelper.Samuel Rødal2010-12-081-0/+2
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-0813-60/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Check Qt::WA_TranslucentBackground instead of custom widget property.Michael Dominic K2010-12-083-33/+7
| * | | | | | | | | | | | | | | | | | | New translucency API for the meego graphics system.Michael Dominic K2010-12-082-0/+22
| * | | | | | | | | | | | | | | | | | | Support for 'qglTranslucent' in QGLWindowSurface.Michael Dominic K2010-12-081-1/+19
| * | | | | | | | | | | | | | | | | | | Use a different dither distribution matrix + a bit of rand.Michael Dominic K2010-12-081-4/+7
| * | | | | | | | | | | | | | | | | | | Fixed cubic bezier rendering bug in qgrayraster.Samuel Rødal2010-12-081-1/+1
| * | | | | | | | | | | | | | | | | | | Revert "qgrayraster: Speed up rendering of small cubic splines."Samuel Rødal2010-12-081-16/+20
| * | | | | | | | | | | | | | | | | | | Fix QWingedEdge memory usage issueJiang Jiang2010-12-081-7/+7
| * | | | | | | | | | | | | | | | | | | Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface alr...Michael Dominic K2010-12-081-1/+8
| * | | | | | | | | | | | | | | | | | | Prevent always deep-copying in QPixmap::toImage() for raster pixmaps.Samuel Rødal2010-12-072-11/+12
| * | | | | | | | | | | | | | | | | | | Fix text disappearing on GL when RGB-path is taken (no transformation)Eskil Abrahamsen Blomfeldt2010-12-071-8/+11
| * | | | | | | | | | | | | | | | | | | Fix for GCC on Windows x64.Ruben Van Boxem2010-12-071-7/+7
| * | | | | | | | | | | | | | | | | | | Fix crash in QTextDocument::markContentsDirtyJiang Jiang2010-12-061-2/+4
| * | | | | | | | | | | | | | | | | | | Make sure to do a deep copy of a QImage when it's being painted on.Samuel Rødal2010-12-064-8/+58
* | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-087-16/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update .def files after 783a278f243c6411f5f32d11f2165b9eed9b6f8cTor Arne Vestbø2010-12-081-2/+4
| * | | | | | | | | | | | | | | | | | | Proxy mode was not correctly checked.Jukka Rissanen2010-12-081-2/+2
| * | | | | | | | | | | | | | | | | | | Don't emit activeFocusChanged() unless the active focus actually changedTor Arne Vestbø2010-12-075-12/+155
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-081-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | QLabel wordwrap to respect maximumSizeJanne Koskinen2010-12-091-1/+1
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed a BC break between S60 SDK 3.2 and 5.0.axis2010-12-071-0/+7
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-062-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
|/ / / / / / / / / / / / / /