summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-161-1/+1
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-151-1/+1
| |\
| | * doc: Fix documentation of QTextEdit::setDocumentEskil Abrahamsen Blomfeldt2010-11-151-1/+1
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1535-206/+236
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-152-2/+9
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-152-2/+9
| | |\ \
| | | * | Crash fix, when the Object will be deleted during handling a QGestureEvent.Dominik Holland2010-11-122-2/+9
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1523-133/+125
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-151-3/+3
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7stagingVille Pernu2010-11-1520-176/+251
| | | |\ \ \ \
| | | * | | | | Fix for KERN-EXEC 0 caused by QNetworkAccessManager::getVille Pernu2010-11-121-3/+3
| | | * | | | | Minor adjustments to merge-request 915Donald Carr2010-11-121-2/+2
| | | * | | | | Implement brush transformations for directfb.Sam Magnuson2010-11-121-14/+28
| | | * | | | | Add FreeBSD's certificate bundle to the certificates list.Raphael Kubo da Costa2010-11-121-0/+1
| | | * | | | | SSL internals: upon error, read all errors from OpenSSLPeter Hartmann2010-11-122-17/+27
| | | * | | | | Added an example for QTest::touchEvent to the documentation.Denis Dzyubenko2010-11-121-0/+3
| | | * | | | | Push and pop the thread-default context for the current threadPhilip Van Hoof2010-11-121-0/+7
| | | * | | | | Fix compilation by s/intptr_t/quintptr/Thiago Macieira2010-11-123-4/+4
| | * | | | | | Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWaitPerttu Pohjonen2010-11-152-14/+33
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1520-116/+89
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | QNAM HTTP: Ignore double content-length headersMarkus Goetz2010-11-132-3/+19
| | | * | | | Don't pack Harfbuzz structs, this causes unaligned access crashes.Andreas Kling2010-11-1210-78/+0
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-118-35/+70
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Minor adjustments to merge-request 915Donald Carr2010-11-111-2/+2
| | | | * | | Implement brush transformations for directfb.Sam Magnuson2010-11-111-14/+28
| | | | * | | Add FreeBSD's certificate bundle to the certificates list.Raphael Kubo da Costa2010-11-111-0/+1
| | | | * | | SSL internals: upon error, read all errors from OpenSSLPeter Hartmann2010-11-112-17/+27
| | | | * | | Added an example for QTest::touchEvent to the documentation.Denis Dzyubenko2010-11-111-0/+3
| | | | * | | Push and pop the thread-default context for the current threadPhilip Van Hoof2010-11-111-0/+7
| | | | * | | Fix compilation by s/intptr_t/quintptr/Thiago Macieira2010-11-113-4/+4
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-151-37/+23
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | ListView: items with size < 1.0 were layed out incorrectly.Martin Jones2010-11-151-3/+3
| | * | | | | ListView.SnapToItem with ListView.StrictlyEnforceRange is broken.Martin Jones2010-11-151-34/+20
| | |/ / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-156-17/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove driver bug work-around from GL 2 paint engine.Samuel Rødal2010-11-121-5/+0
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-125-12/+5
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Don't set -mfpu=neon globally if the compiler supports neon.Samuel Rødal2010-11-115-12/+5
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-153-17/+74
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix PathView key navigation docs.Martin Jones2010-11-121-1/+15
| | * | | | Ensure increment/decrementCurrentIndex always move items in the correct direc...Martin Jones2010-11-122-10/+24
| | * | | | Ensure loaded item's parent is set before component completion.Martin Jones2010-11-121-6/+35
| | | |/ / | | |/| |
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-155-78/+158
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-11-115-78/+158
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Doc: Fixing typoSergio Ahumada2010-11-111-1/+1
| | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-096-5/+101
| | |\ \ \
| | * | | | QS60Style: Color calculation should be optimizedSami Merila2010-11-092-5/+5
| | * | | | QS60Style: Color calculation should be optimizedSami Merila2010-11-093-59/+130
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-083-17/+15
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-0517-46/+94
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-0411-41/+82
| | |\ \ \ \ \ \