summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-08871-11658/+51823
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-078-138/+133
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-068-138/+133
| | |\
| | | * Avoid compilation warnings on Symbianaavit2011-04-063-3/+5
| | | * Get rid of double conversions and arithmetic when qreal is float.Samuel Rødal2011-04-065-135/+128
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-07738-2475/+49394
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07738-2475/+49394
| | |\ \ \ | |/ / / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-073-1/+12
| | |\ \ \
| | | * | | QmlViewer: Enable remote qml debuggingKai Koehne2011-04-061-0/+3
| | | * | | QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debugKai Koehne2011-04-062-1/+9
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-0650-683/+1227
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-0538-602/+951
| | | |\ \ \ \
| | | | * | | | Fixed the declarative headers and includes within qdoc.David Boddie2011-04-0522-56/+56
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0580-408/+1129
| | | | |\ \ \ \
| | | | * | | | | Removed invalid public slots section.David Boddie2011-04-051-2/+0
| | | | * | | | | Minor feature fix led to refactoring for i18n's sake.David Boddie2011-04-058-509/+859
| | | | * | | | | Fixed string-int concatenation issue.David Boddie2011-04-051-1/+1
| | | | * | | | | Merge branch '4.7' of ../qt-doc-team-threading into 4.7David Boddie2011-04-052-6/+6
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7David Boddie2011-03-29957-2463/+59705
| | | | | |\ \ \ \ \
| | | | | * | | | | | Doc: Minor fix to title.David Boddie2011-03-291-1/+1
| | | | | * | | | | | Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7David Boddie2011-03-1810-196/+205
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Doc: Squashed commit of Roland Wolf's threading tutorial.David Boddie2011-03-172-6/+6
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-2946-349/+1191
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Doc: Fixed markup.David Boddie2011-03-251-2/+2
| | | | * | | | | | | | Doc: Added a missing command.David Boddie2011-03-251-1/+1
| | | | * | | | | | | | Doc: Removed duplicate documentation.David Boddie2011-03-251-13/+0
| | | | * | | | | | | | Removed some links and prettified others.David Boddie2011-03-251-12/+26
| | | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-0510-48/+153
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | * | | | | | | | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-0510-48/+153
| | | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-014-33/+123
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-0118-87/+106
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | qdoc: modified \include to take a 2nd arg, snippet id.Martin Smith2011-04-014-33/+123
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-061-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Not possible to enter negative values to widgets with numeric fieldsSami Merila2011-04-061-0/+2
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-066-82/+195
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-066-82/+195
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-0510-192/+185
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fixed license headers for examples in 4.7Timo Turunen2011-04-057-189/+182
| | | * | | | | | | | | | | | Removing extra comma in `enum' declaration.Sergio Ahumada2011-04-051-1/+1
| | | * | | | | | | | | | | | win32-g++: Correct the order of linked Windows librariesMark Brand2011-04-051-1/+1
| | | * | | | | | | | | | | | Remove SIGBUS emission from QNetworkSession destruction.Cristiano di Flora2011-04-051-1/+1
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-051-5/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Take phonon backend back in qt.ibyGuoqing Zhang2011-04-051-5/+2
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-051-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Mac: p2 combobox regression fixRichard Moe Gustavsen2011-04-051-3/+3
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-041-13/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Remove obsolete files from qt.ibyMiikka Heikkinen2011-04-041-13/+0
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-045-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-044-4/+4
| | | * | | | | | | | | | | | | Fixing a traling space on if statement that fails in Solaris.Sergio Ahumada2011-04-041-1/+1