summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-119-22/+250
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-119-22/+250
| |\
| | * Update QML "What's New" docs.Martin Jones2011-03-114-7/+43
| | * Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.Andrew den Exter2011-03-113-2/+21
| | * Fix ListView boundary extents for RTL layout.Martin Jones2011-03-113-9/+182
| | * Fix compiler warning.Andrew den Exter2011-03-111-4/+4
* | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-11361-2172/+4343
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-03-11276-283/+283
| |\ \ \
| | * | | Update copyright year to 2011.Rohan McGovern2011-03-10276-283/+283
| |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-101-1/+1
| |\ \ \
| | * | | Configuring a static Qt build did not exclude WebKit if the -webkit option wa...Christian Strømme2011-03-101-1/+1
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-1013-29/+177
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-101-0/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-03-091-0/+3
| | |\ \ \ \ \
| | | * | | | | Refroze QtCore ARMV5 DEF filesEckhart Koppen2011-03-091-0/+3
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-099-45/+53
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-03-07218-1206/+7799
| | |\ \ \ \ \ \ \
| | | * | | | | | | Removed obsolete documentation from QPixmap.Samuel Rødal2011-03-071-10/+0
| | | * | | | | | | Fixed auto-test failures caused by a3a79fefe65ec12.Samuel Rødal2011-03-071-2/+5
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-042-1/+6
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Place cursor at the end of the selected rangeJiang Jiang2011-03-041-1/+1
| | | | * | | | | | | Fail in a nicer way when QPixmap is used in a non-GUI application.Samuel Rødal2011-03-041-0/+5
| | | * | | | | | | | Merge branch 'lancelot'aavit2011-03-047-34/+44
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Improved error msgaavit2011-03-041-1/+1
| | | | * | | | | | | | Build fix for shadow built Qtaavit2011-03-012-5/+5
| | | | * | | | | | | | Make updating single baseline work againaavit2011-03-014-13/+11
| | | | * | | | | | | | Updated for new git repo structureaavit2011-03-011-1/+1
| | | | * | | | | | | | Re-added the update-all-baselines commandaavit2011-03-014-26/+38
| | | | |/ / / / / / /
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Fix warning about uninitialised variable useThiago Macieira2011-03-081-1/+1
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-0911-277/+606
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-03-085-4/+185
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Updated ARMV5 DEF filesEckhart Koppen2011-03-085-4/+185
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-03-08339-2832/+11545
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Refroze WINSCW DEF files for SymbianEckhart Koppen2011-03-084-1/+280
| | | * | | | | | | | Merge remote branch 'qt-master/master'Eckhart Koppen2011-03-08335-2831/+11265
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-03-012-272/+141
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Simplified header export script for SymbianEckhart Koppen2011-03-012-272/+141
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-02-18123-515/+2676
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| * | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-0817-28/+218
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-086-7/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix preprocessor directive.Fabien Freling2011-03-041-1/+1
| | * | | | | | | | | | | Fix compiling issue on Lion.Fabien Freling2011-03-042-0/+14
| | * | | | | | | | | | | Add support for Mac OS X 10.7 "Lion".Fabien Freling2011-03-042-2/+9
| | * | | | | | | | | | | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| | * | | | | | | | | | | Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-083-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Designer: Set dirty correctly in case resource paths were changed.Friedemann Kleint2011-03-073-1/+5
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-0715-918/+1255
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fix a typo in an EXPECT_FAIL dataset name.Jedrzej Nowacki2011-03-071-1/+1