summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)Richard Moe Gustavsen2011-01-191-1/+6
* Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engineRichard Moe Gustavsen2011-01-191-10/+4
* Merge remote branch 'alien-on-cocoa/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-186-16/+30
|\
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-183-1/+12
| |\
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-183-1/+12
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-171-1/+3
| | | |\
| | | | * Fix double click event on Mac OS X.Fabien Freling2011-01-171-1/+3
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-172-0/+9
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-142-0/+9
| | | | |\
| | | | | * Fix memory leakAaron Kennedy2011-01-141-0/+5
| | | | | * Clarify Component.createObject(null) behavior.Martin Jones2011-01-141-0/+4
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-01-182-13/+13
| |\ \ \ \ \
| | * | | | | qRound: do not do operation with double when qreal is floatOlivier Goffart2011-01-171-2/+2
| | * | | | | Fix the warnings when QBasicTimer are member of the ObjectPrivateOlivier Goffart2011-01-171-11/+11
| | |/ / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-01-171-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPreviousJedrzej Nowacki2011-01-171-2/+2
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alie...Richard Moe Gustavsen2011-01-173968-12311/+30937
|\| | | | |
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-173845-4837/+11050
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | various fixes to deal with CI gate failuresJeremy Katz2011-01-141-15/+15
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-142-0/+269
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-142-0/+269
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-142-0/+269
| | | | |\
| | | | | * QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-122-0/+269
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-141-3/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-141-3/+2
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Proper fix for QGraphicsItem crash.Yoann Lopes2011-01-131-3/+2
| | | | |/
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-141-4/+16
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix QSystemSemaphore handle management issues in SymbianMiikka Heikkinen2011-01-131-4/+16
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-131-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-131-1/+1
| | | |/
| | * | Fix corelib def files.Miikka Heikkinen2011-01-122-0/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-1217-39/+185
| | |\ \ | | | |/ | | |/|
| | | * Remove sqlite3_selfsigned.sis as it is no longer usable or needed.Miikka Heikkinen2011-01-112-2/+1
| | | * Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-114-23/+93
| | | * Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-111-0/+2
| | | * Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1111-14/+89
| | * | Doc: Fixed a few misspellings of FlipableThorbjørn Lindeijer2011-01-111-2/+2
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-111-2/+2
| | |\
| | | * OpenVG paint engine doesn't draw glyphs well to non-integer offsets.Jani Hautakangas2011-01-111-2/+2
| | * | QTextCodec::codecForMib: actually use the cacheOlivier Goffart2011-01-111-1/+4
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-116-9/+18
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-113822-3838/+3838
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-114-3/+16
| | | |\ \
| | | | * | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-103-1/+12
| | | | * | Fix handle leak in symbian QTimer implementationShane Kearns2011-01-101-2/+4
| | | * | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-102-6/+2
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| | | | * | Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-051-4/+0
| | * | | | Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into inte...Lorn Potter2011-01-114-585/+20
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2010-12-094-585/+20