summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-232-17/+35
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-231-0/+3
| |\
| * \ Merge branch '4.7-s60' into 4.7-s60axis2010-11-230-0/+0
| |\ \
| * \ \ Merge branch '4.7' into 4.7-s60axis2010-11-23121-5184/+7779
| |\ \ \
* | | | | Native color dialog on symbianMilla Pohjanheimo2010-11-233-6/+131
| |_|_|/ |/| | |
* | | | Fix non-stroked filled paths in OpenVG paint engine.Jason Barron2010-11-231-0/+3
| |_|/ |/| |
* | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-23123-5219/+7796
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-2213-24/+529
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1946-56/+345
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-19395-12125/+9087
| | |\ \
| | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1817-584/+560
| | | |\ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-17390-12069/+9055
| | | |\ \ \
| | * | | | | Doc: Documented that border width does not affect rectangle geometry.David Boddie2010-11-191-0/+3
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-17526-6294/+13909
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-161-1/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-15187-1579/+1842
| | | |\ \ \ \ \
| | | * | | | | | Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt QuickMorten Engvoldsen2010-11-153-2/+501
| | | * | | | | | Doc: Correcting references to Qt Declarative module.Morten Engvoldsen2010-11-157-16/+16
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-156-78/+170
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-126-78/+170
| | | | |\ \ \ \ \ \
| | | * | | | | | | | doc: Stated that the destructor does not call close().Martin Smith2010-11-121-1/+4
| | | |/ / / / / / /
| | * | | | | | | | Doc: Minor fixes to style.David Boddie2010-11-171-2/+2
| | * | | | | | | | Doc: Updated the DirectFB documentation to reflect version changes.David Boddie2010-11-171-3/+3
| * | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-220-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-11-220-0/+0
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-11-222-2/+22
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-226-28/+49
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Compile when USER_TIMER_MINIMUM isn't definedBradley T. Hughes2010-11-221-1/+1
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-11-2265-641/+928
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-195-23/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-195-23/+45
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Fix compilation with Sun Studio 12.1.Thiago Macieira2010-11-191-2/+2
| | | | | * | | | | | | | | | Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| | | | | * | | | | | | | | | silence compiler warningsHarald Fernengel2010-11-192-7/+7
| | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-181-14/+34
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | Don't let posted events starve native dialogs (regression)Bradley T. Hughes2010-11-181-14/+34
| | * | | | | | | | | | | | | Docs: QTBUG-10866 Description of how AutoConnection is resolved.Peter Yard2010-11-221-5/+4
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-22103-5132/+7201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Update qml visual tests on mac.Yann Bodson2010-11-22102-5131/+7199
| | * | | | | | | | | | | | DocAaron Kennedy2010-11-221-1/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Fix symbian-mmp.conf include pathMiikka Heikkinen2010-11-222-3/+3
* | | | | | | | | | | | | Fix a build break when namespace is definedMiikka Heikkinen2010-11-221-17/+17
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1978-591/+1328
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-192-17/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-1916-55/+91
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-1927-627/+624
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1869-524/+1212
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Add symbian scope for qfiledialog_symbian.cppMiikka Heikkinen2010-11-181-1/+1
| | | * | | | | | | | | | Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-189-5/+32