summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-183-51/+51
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-183-51/+51
| |\
| | * Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-05-183-51/+51
| |/
* | Merge branch '4.8' of git:qt/qt into qt-4.8-from-4.7Thiago Macieira2011-05-180-0/+0
|\ \
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-1764-116/+785
| |\ \
* | \ \ Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-177931-131598/+131634
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-177939-131573/+131580
| |\ \ \
| | * | | Updating file with CRLF line endings for the updated headerSergio Ahumada2011-05-171-29/+29
| | * | | Fix a regression in QList::mid()Liang Qi2011-05-162-0/+5
| | * | | update gitignoreOswald Buddenhagen2011-05-131-2/+5
| | * | | remove -fno-stack-protectorOswald Buddenhagen2011-05-131-2/+1
| | * | | Fix make confcleanAnders Bakken2011-05-131-4/+4
| | * | | Update licenseheader text in source filesJyri Tahtela2011-05-137936-131576/+131576
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-161-2/+2
| |\ \ \ \
| | * | | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-1518-174/+203
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-13339-2707/+30191
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-1310-156/+185
| | | |\ \ \ \ \
| | | * | | | | | Fix memory leak in QXmlQuery::setQuery.Niklas Kurkisuo2011-05-138-18/+18
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-3/+9
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | | * | | | | | doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-26/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-119-145/+193
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-092-1/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-091-1/+1
| | | |\ \ \ \ \ \
| | | * | | | | | | doc: Fixed a QML snippet referenceMartin Smith2011-05-092-1/+2
* | | | | | | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-17189-8502/+1636
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-05-17103-978/+1100
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote branch 'origin/4.8' into qa-review-masterRohan McGovern2011-05-152772-115383/+272395
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-136-4/+79
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed license header.Rohan McGovern2011-05-131-0/+42
| | | * | | | | | | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-126-4/+37
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-122-2/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Remove Q_ASSERT's from qsharedmemory autotestJason McDonald2011-05-112-2/+4
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-101-7/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Remove Q_ASSERT's from QNetworkReply autotestJason McDonald2011-05-101-7/+11
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-108-34/+54
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Remove Q_ASSERT's from qabstractxmlnodemodel testJason McDonald2011-05-101-8/+7
| | | * | | | | | | | | Remove Q_ASSERT from QXmlStream autotestJason McDonald2011-05-101-3/+3
| | | * | | | | | | | | Remove Q_ASSERT from qxmlquery autotestJason McDonald2011-05-101-3/+2
| | | * | | | | | | | | Remove Q_ASSERT's from QXmlStream autotestJason McDonald2011-05-101-5/+10
| | | * | | | | | | | | Remove Q_ASSERT from QItemModel autotestJason McDonald2011-05-101-1/+2
| | | * | | | | | | | | Remove Q_ASSERT's from qxmlquery autotestJason McDonald2011-05-102-4/+11
| | | * | | | | | | | | Remove Q_ASSERT from qxmlquery autotestJason McDonald2011-05-102-1/+8
| | | * | | | | | | | | Remove Q_ASSERT's from QXmlStream autotestJason McDonald2011-05-101-6/+8
| | | * | | | | | | | | Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-101-3/+3
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-102-12/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /