summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0822-76/+314
|\
| * 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
| |\ \ \ | | |/ / | |/| |
| | * | Fixed a BC break between S60 SDK 3.2 and 5.0.axis2010-12-071-0/+7
| |/ /
* | | Remove whitespace and leading tab from documentation changeSami Merila2010-12-081-1/+1
* | | Merge commit 'refs/merge-requests/2509' of gitorious.org:qt/qt into integrationSami Merila2010-12-081-0/+3
|\ \ \
| * | | Adding warning to QMenu documentationKarim Pinter2010-11-261-0/+3
* | | | Merge commit 'refs/merge-requests/2512' of gitorious.org:qt/qt into integrationSami Merila2010-12-071-0/+2
|\ \ \ \
| * | | | Updating merge request 2512Karim Pinter2010-12-071-3/+1
| * | | | Removes the reseting of the QMenu offset.Karim Pinter2010-11-291-0/+4
* | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-063-4/+18
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
| |/ / /
* | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-03108-2594/+4587
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-035-28/+81
| |\ \ \
| | * | | rebuild configureOswald Buddenhagen2010-12-031-0/+0
| | * | | fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| | * | | Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| | * | | Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| | * | | VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| | * | | Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| | * | | Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | * | | build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
| | * | | purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-032-12/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Unify epocroot usage in createpackage and patch_capabilities scriptsMiikka Heikkinen2010-12-032-12/+19
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0332-1113/+1119
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update visual tests for the recent qmlviewer changeAlan Alpert2010-12-0331-1113/+1113