summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-0913-29/+177
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-097-7/+136
| | |\ \
| | | * | Fix unstable qdeclarativeflickable test.Martin Jones2011-03-081-2/+2
| | | * | Update TextEdit's visible selection when only the anchor changes.Andrew den Exter2011-03-083-5/+56
| | | * | Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-074-0/+78
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-081-1/+1
| | |\ \ \
| | | * | | Fixed memory leak in GL texture cache with QRuntimePixmapData.Samuel Rødal2011-03-071-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-083-19/+38
| | |\ \ \ \
| | | * | | | Fix possible bearer management Crash with Panic E32USER-CBase, 69Cristiano di Flora2011-03-081-6/+5
| | | * | | | QNetworkCookie: fix quoted valuesPeter Hartmann2011-03-072-13/+24
| | | * | | | Fix for QTBUG-17746. Quotes is retained in cookie valueAparna Nandyal2011-03-071-7/+15
| | | * | | | Unsuccessful unlocking of QNetworkConfigurationPrivate mutexPerttu Pohjonen2011-03-071-0/+1
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-03-082-2/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-082-2/+2
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-172-36/+66
| | | | |\ \ \ \ \
| | | | | * | | | | Fixed unescaped backslashes in testcase.prfRohan McGovern2011-01-171-2/+2
| | | | | * | | | | Fix `make check' for debug-and-release on Windows.Rohan McGovern2011-01-171-2/+16
| | | | | * | | | | Move `check' target for autotests into testcase.prfRohan McGovern2011-01-172-35/+52
| | | | | * | | | | Revert "Backporting TESTARGS feature from 4.7"João Abecasis2011-01-171-1/+0
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-121-0/+1
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Backporting TESTARGS feature from 4.7João Abecasis2011-01-121-0/+1
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-128990-9063/+9063
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Update copyright year to 2011.Jason McDonald2011-01-108990-9063/+9063
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2010-12-201-0/+2
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
* | | | | | | | | | 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