summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-117-9/+56
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1010434-10534/+10537
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-105-3/+54
| |\ \
| | * | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-103-1/+12
| | * | Fix handle leak in symbian QTimer implementationShane Kearns2011-01-102-2/+42
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-102-6/+2
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-102-6/+2
| | |\ \ | |/ / /
| | * | Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| | * | Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-051-4/+0
* | | | Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into inte...Lorn Potter2011-01-114-585/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2010-12-094-585/+20
* | | | QFont/Windows: restrict the pixel size accuracyJoerg Bornemann2011-01-101-1/+1
* | | | Update copyright year to 2011.Jason McDonald2011-01-1010433-10520/+10520
* | | | For non-developer builds, skip test that requires private APIAdrian Constantin2011-01-101-0/+3
* | | | tst_qhttpnetworkconnection: Compile fixMarkus Goetz2011-01-101-7/+7
* | | | Change QHostInfoCache to use QElapsedTime instead of QTime.Niklas Kurkisuo2011-01-102-3/+3
* | | | Fix for qtdemo bugJerome Pasion2011-01-101-3/+3
| |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-1015-318/+318
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-01-1021-2761/+144
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-103-67/+89
|\ \ \ \
* \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-1021-2761/+144
|\ \ \ \ \
| * | | | | network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-106-51/+142
| * | | | | Remove garbage empty test.Rohan McGovern2011-01-1014-2710/+0
| * | | | | tst_networkselftest: add checks for echo, daytimeRohan McGovern2011-01-101-0/+2
|/ / / / /
| | * | | Update pathview testAlan Alpert2011-01-1015-318/+318
| |/ / /
| * | | Fix loaded() signal to be emitted only onceBea Lam2011-01-103-67/+89
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-075-6/+10
|\ \ \
| * | | CLucene: Use the right delete operator.Christian Kandeler2011-01-072-2/+2
| * | | Examples: Fix compilation with namespace.Christian Kandeler2011-01-072-4/+4
| * | | fix build with QT_NO_BEARERMANAGEMENTPeter Hartmann2011-01-071-0/+4
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-0723-24/+79
|\ \ \ \
| * | | | Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-072-1/+56
| * | | | Doc: Fixing typoSergio Ahumada2011-01-0721-23/+23
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-01-0713-254/+21
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /