summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0356-174/+329
|\
| * Don't write to the logger widget while the application is closing down.Robert Griebl2010-07-021-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0255-173/+328
| |\
| | * Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-022-0/+8
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-021-14/+24
| | |\
| | | * docs - fix doc links, minor improvementsBea Lam2010-07-021-14/+24
| | * | Fix test for N900 (ARM-specific SVG results).Warwick Allison2010-07-024-8/+6
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-0237-299/+380
| | |\
| | | * Fix TextEdit bitmap tests testing the wrong elementJoona Petrell2010-07-022-4/+4
| | | * Fix TextInput text getting improperly clippedJoona Petrell2010-07-029-22/+110
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-02153-8569/+5927
| | | |\
| | | | * fix doc linksBea Lam2010-07-0210-11/+12
| | | | * Fix docs to link to the new QML Viewer page instead of the Runtime pageBea Lam2010-07-0211-29/+45
| | | * | qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-021-42/+62
| | * | | Make autotests work with qreal == float (in addition to double).Warwick Allison2010-07-0216-51/+58
| | * | | Don't accept *files* that exist when *directory* is required.Warwick Allison2010-07-024-2/+9
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-029-4/+46
|\ \ \ \ \
| * | | | | Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9Simon Hausmann2010-07-029-4/+46
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-023-4/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Crash when dragging with mingwThierry Bastian2010-07-022-3/+4
| * | | | Don't do alpha/opaque check which might cause a conversion and later pointer ...Michael Dominic K2010-07-021-1/+1
| | |_|/ | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-029-11/+25
|\ \ \ \ | |/ / / |/| | |
| * | | 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