summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream'Thierry Bastian2011-03-10277-1970/+7280
|\
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-107-14/+27
| |\
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-097-14/+27
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-093-1/+3
| | | |\
| | | | * Update TextEdit's visible selection when only the anchor changes.Andrew den Exter2011-03-081-1/+1
| | | | * Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-072-0/+2
| | | * | 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-082-11/+22
| | | |\ \ \
| | | | * | | Fix possible bearer management Crash with Panic E32USER-CBase, 69Cristiano di Flora2011-03-081-6/+5
| | | | * | | QNetworkCookie: fix quoted valuesPeter Hartmann2011-03-071-5/+8
| | | | * | | 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-081-1/+1
| | | |\ \ \ \
| | | | * \ \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-081-1/+1
| | | | |\ \ \ \
| | | | | * | | | Update copyright year to 2011.Jason McDonald2011-01-103357-3367/+3367
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-101-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-092-11/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-099-5/+465
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Updated ARMV5 DEF filesEckhart Koppen2011-03-085-4/+185
| | * | | | | | | | | | Refroze WINSCW DEF files for SymbianEckhart Koppen2011-03-084-1/+280
| * | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-0811-24/+84
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-084-0/+34
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-074-0/+34
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-074-0/+34
| | * | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-048-24/+50
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-044-2/+10
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-044-2/+10
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-044-22/+40
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | * | | | | | | | Fix word selection locking on string boundaries.Andrew den Exter2011-03-041-11/+14
| | | | * | | | | | | | Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
| | | | * | | | | | | | QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-032-8/+21
| | | | * | | | | | | | Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-031-1/+1
| * | | | | | | | | | | 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-air-staging into master...Qt Continuous Integration System2011-03-072-63/+64
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Improve Q_GLOBAL_STATIC macors.Jedrzej Nowacki2011-03-072-63/+64
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-0435-590/+1450
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-2835-590/+1450
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | QAbstractSocket: Check for socket state on Unbuffered readsMarkus Goetz2011-02-251-0/+2