summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-0713-254/+21
|\
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-031-0/+9
| |\
| | * Fix crash when closing QFontDialog::getFont() dialogGabriel de Dietrich2011-01-031-0/+9
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-2354-598/+3351
| |\ \ | | |/
| | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2354-598/+3351
| | |\
| * | \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-227-123/+228
| |\ \ \ | | |/ /
| | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-227-123/+228
| | |\ \
| * | \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-2271-3515/+2235
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2158-3499/+2125
| | |\ \ \
| | * | | | Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2013-14/+101
| | |\ \ \ \
| * | \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-182-2/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-182-2/+9
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-1711-18/+23
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1711-18/+23
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-1622-281/+92
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1612-31/+91
| | |\ \ \ \ \ \ \
| | * | | | | | | | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-1610-250/+1
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-161-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-12-169-34/+118
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Remove warning about null cursor handle on S60 while handle is validPaul Labedan2010-12-151-2/+2
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-061-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-064-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| * | | | | | | | | | | | QUrl::setUrl should call detachOlivier Goffart2011-01-062-0/+9
| * | | | | | | | | | | | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-065-2/+83
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-063-1/+38
| * | | | | | | | | | | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-063-1/+45
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| * | | | | | | | | | | Doc fixes for introduction page and Item docsBea Lam2011-01-062-111/+130
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0510-130/+1779
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix outdated testsAlan Alpert2011-01-0510-130/+1779
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-043-1/+51
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| * | | | | | | | | | | Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-049-11/+81
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.Michael Dominic K2011-01-043-1/+34
| * | | | | | | | | | | | Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
| * | | | | | | | | | | | Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| * | | | | | | | | | | | QMeeGoSwitchEvent exported and static.Michael Dominic K2011-01-041-2/+2
| * | | | | | | | | | | | Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-042-1/+28
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0420-923/+923
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update visual testsAlan Alpert2011-01-0420-923/+923
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Ignore static_and_shared in Symbian builds.Miikka Heikkinen2011-01-031-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fixed networkselftest failing to resolve hostnameRohan McGovern2010-12-301-1/+1
|/ / / / / / / / / / /