summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-025-3/+9
|\
| * Designer: Fix compiler warnings.Friedemann Kleint2010-07-025-3/+9
* | qdoc: Fixed spacing before "default" and "read-only".Martin Smith2010-07-023-7/+10
|/
* Fix compiler warning.Aaron McCarthy2010-07-021-1/+1
* Abort if connection to DBus cannot be established.Aaron McCarthy2010-07-021-0/+5
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-015-191/+147
|\
| * Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-015-191/+147
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-017-24/+74
|\ \ | |/ |/|
| * Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10Simon Hausmann2010-07-017-24/+74
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0113-20/+31
|\ \ | |/ |/|
| * QSslSocket::systemCaCertificates(): have one common case for all UnicesPeter Hartmann2010-07-011-7/+4
| * Fixed QX11EmbedContainer.Denis Dzyubenko2010-07-011-0/+1
| * Improved a bit detection of a touch screen on Windows.Denis Dzyubenko2010-07-011-1/+6
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-017-7/+7
| |\
| | * link glu32 before opengl32Oswald Buddenhagen2010-07-017-7/+7
| * | qdoc: Fixed invalid format in the html header.Martin Smith2010-07-012-5/+12
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0114-686/+736
| |\
| * | Stopped trying to output QML property list in 2 columnsMartin Smith2010-06-301-0/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-0176-271/+1466
|\ \ \
| * | | Symbian on Linux: $QTDIR/bin is not necessarily in the path.Olivier Goffart2010-07-018-9/+11
| * | | Updated Symbian def files with new EGL exports.Samuel Rødal2010-07-012-0/+4
| * | | Added another missing EGL stub.Samuel Rødal2010-07-011-0/+8
| * | | Fixed compilation on Symbian.Samuel Rødal2010-07-011-2/+2
| * | | Added missing EGL stub function.Samuel Rødal2010-07-011-0/+9
| * | | Got rid of unused variable compiler warning.Samuel Rødal2010-07-011-1/+1
| * | | QGLWindowSurface support for partial updates via EGL_NOK_swap_region2Michael Dominic K2010-07-014-2/+41
| * | | Adding func prototypes for EGL_NOK_swap_region2 extension.Michael Dominic K2010-07-013-0/+46
| * | | Check for EGLSurface leak only when paint device is a QGLWidget.Michael Dominic K2010-07-011-9/+12
| * | | Fixed bug in drawTiledPixmap when width of pixmap matches target rect.Samuel Rødal2010-07-011-1/+2
| * | | Update def files for symbianOlivier Goffart2010-07-013-0/+68
| * | | Improved performance of 16 bit memrotates using NEON instructions.Samuel Rødal2010-07-017-22/+310
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-0158-228/+955
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-3058-228/+955
| | |\ \
| | | * | Use built-in iconv on Solaris if availablePierre Rossi2010-06-303-0/+9
| | | * | Export various symbols needed to make a custom GL graphicssystem.Michael Dominic K2010-06-304-3/+5
| | | * | Moc: fix compilation when templated types with multiple arguments are used.Olivier Goffart2010-06-303-4/+28
| | | * | Fixes the documentation of QGraphicsEffect::update().Yoann Lopes2010-06-301-6/+3
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-06-302411-54171/+52001
| | | |\ \
| | | | * | Avoid calling time.elapsed() twice in abstract animationLeonardo Sobral Cunha2010-06-302-3/+4
| | | | * | Adds slowdownFactor to UnifiedTimer in abstract animationLeonardo Sobral Cunha2010-06-302-4/+16
| | | | * | Add the conversion in-place for QPixmap::fromImageReader() on raster.Benjamin Poulain2010-06-304-0/+73
| | | | * | Add QPixmap::fromImageReader() to decode arbitrary images in place.Benjamin Poulain2010-06-304-1/+35
| | | | * | Add missing license header.Jason McDonald2010-06-301-0/+41
| | | | * | Fixed a crash in menubar with invisible actionsThierry Bastian2010-06-302-1/+30
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-3040-193/+645
| | | | |\ \
| | | | | * | Fixed ARM .def files.Rohan McGovern2010-06-301-0/+5
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2939-193/+640
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2939-193/+640
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-291927-48052/+40091
| | | | | | | |\ \
| | | | | | | | * | Made -graphicssystem trace work with Qt::TextBypassShaping flag.Samuel Rødal2010-06-293-4/+4