summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into int...David Boddie2010-08-052-5/+4
|\
| * Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-07-271-1/+1
| * Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-07-271-4/+3
* | Doc: Fixed typo in a shortcut string.David Boddie2010-08-041-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-04909-8752/+29584
|\ \
| * | Assistant: Revert previous commit, issue was already fixed.ck2010-08-041-2/+1
| * | fix line endingsOswald Buddenhagen2010-08-043-82/+82
| * | fix compilation with -plugin-kbd-*Oswald Buddenhagen2010-08-041-1/+1
| * | Fix typo in docsAnders Bakken2010-08-041-2/+2
| * | Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-044-2/+27
| * | Fix compilation with QT_NO_DBUSTasuku Suzuki2010-08-042-0/+12
| * | fix inaccurate commentOswald Buddenhagen2010-08-041-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0426-647/+2307
| |\ \
| | * | Assistant: Include QML docsck2010-08-041-1/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-041-3/+8
| | |\ \
| | | * | Cocoa: Showing a QFontDialog first shows it in the bottom-left cornerRichard Moe Gustavsen2010-08-041-3/+8
| | * | | Fixed the curve descriptions and added descriptions for overshoot, amplitude,...Jerome Pasion2010-08-041-6/+16
| | |/ /
| | * | Mac: fix regression from 65a673f that makes some buttons unclickableRichard Moe Gustavsen2010-08-044-4/+20
| | * | Merge remote branch 'staging/4.7' into qtbug-12631Aaron McCarthy2010-08-0415-587/+2220
| | |\ \
| | | * | new icons for cell and bt networks.Lorn Potter2010-08-038-96/+529
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-03162-1741/+3892
| | | |\ \
| | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-0349-209/+413
| | | | |\ \
| | | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-0352-212/+442
| | | | | |\ \
| | | | | * | | Doc: removing empty links in bread crumbMorten Engvoldsen2010-08-031-3/+3
| | | | * | | | Doc: updating getting started docs - not finishedMorten Engvoldsen2010-08-034-485/+1573
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-01116-1093/+2743
| | | |\ \ \ \ \
| | | * | | | | | add convience methods for getting ethernet service details.Lorn Potter2010-07-302-4/+110
| | | * | | | | | fix spellingLorn Potter2010-07-301-1/+1
| | | * | | | | | fix crashLorn Potter2010-07-301-1/+1
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-3080-599/+914
| | | |\ \ \ \ \ \
| | | * | | | | | | try harder to get cell nameLorn Potter2010-07-291-2/+8
| | * | | | | | | | Fix deadlocks in ICD and NetworkManager engines.Aaron McCarthy2010-08-044-46/+41
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-047-56/+48
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add the qt_ prefix to convert_rgb888_to_rgb32_ssse3Benjamin Poulain2010-08-032-4/+4
| | * | | | | | | | | Update changes-4.7.0Pierre Rossi2010-08-031-0/+3
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-036-55/+44
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Use the fast conversion from RGB888 to RGB32 for Jpeg imagesBenjamin Poulain2010-08-032-7/+25
| | | * | | | | | | | | Move the SIMD defines to the common declaration of Qt symbolsBenjamin Poulain2010-08-033-46/+15
| | | * | | | | | | | | Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORTOlivier Goffart2010-08-031-2/+4
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Assigned valid UID3 for fortuneserver exampleMiikka Heikkinen2010-08-031-1/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-042-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-042-4/+4
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| | * | | | | | | | | | Phonon; Use correct Phonon version numbers.Justin McPherson2010-08-042-4/+4
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-0311-41/+113
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0311-41/+113
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0377-913/+851
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Removed the unfinished sentence. Fix for QTBUG-10173.Jerome Pasion2010-08-031-1/+1
| | * | | | | | | | Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071...Jerome Pasion2010-08-0313-14/+19
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-033-44/+106
| | |\ \ \ \ \ \ \ \