summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-02-281-2/+2
|\
| * Fixed wrong reference to bld.inf in the package_definition.xml fileEckhart Koppen2011-02-221-2/+2
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-263-0/+7
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-253-0/+7
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-252-0/+6
| | |\ \
| | | * | Always prepend drive letter to $$EPOCROOT in Windows Symbian buildsMiikka Heikkinen2011-02-241-0/+5
| | | * | Add files deployed using qmake_emulator_deployment.flm to 'what' listMiikka Heikkinen2011-02-241-0/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-241-0/+1
| | |\ \ \
| | | * | | QRuntimeWindowSystem: Track window size properlySami Kyostila2011-02-241-0/+1
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-2590-506/+1945
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-245-11/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-241-3/+2
| | |\ \ \ \
| | | * | | | Fix QTBUG-17627: build break in mobility bearer applicationsCristiano di Flora2011-02-241-3/+2
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-241-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Add the missing image for doc of QNetworkSession.Xizhi Zhu2011-02-241-0/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-232-7/+12
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTSJani Hautakangas2011-02-232-7/+12
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-231-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix QPlainTextEdit corruption/crash with scrollingmae2011-02-231-1/+1
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-233-8/+47
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-233-8/+47
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | DelayRemove of list delegate on section boundary duplicated sectionMartin Jones2011-02-233-8/+47
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-2383-487/+1883
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-231-0/+5
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-231-0/+5
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-234-6/+6
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | ListView and GridView indexAt should use qreal coordinates.Martin Jones2011-02-234-6/+6
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-222-0/+29
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Prevent infinite loop in raster engine on zero dash pattern length.Samuel Rødal2011-02-222-0/+29
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-221-12/+5
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changesetCristiano di Flora2011-02-221-1/+1
| | | * | | | | Fix QNetworkConfigurationManager crash due to null private pointer.Cristiano di Flora2011-02-221-12/+5
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-02-224-6/+12
| | |\ \ \ \ \ \
| | | * | | | | | Cocoa: Sheets looses focus when moving parent windowRichard Moe Gustavsen2011-02-221-0/+4
| | | * | | | | | Cocoa: fix crash when using a drawer with a focus widgetRichard Moe Gustavsen2011-02-181-1/+1
| | | * | | | | | Fix crash in KPackageKitGabriel de Dietrich2011-02-151-5/+6
| | | * | | | | | Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-15176-768/+9812
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-08637-17850/+26913
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2011-02-0181-4754/+5648
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Plug memory leak when using qt_mac_set_dock_menu() on CocoaAndy Shaw2011-01-261-0/+1
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-2228-115/+815
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-22390-17250/+13086
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-211-133/+138
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jason McDonald2011-02-211-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Add selected P1 tasks to changes file.Jason McDonald2011-02-211-133/+138
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-215-6/+41
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-213-0/+35
| | | * | | | | | | | | | Only add NetworkServices capability automatically if no caps are set.Miikka Heikkinen2011-02-212-6/+6
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Wheel delta is always zero in QEventTransition's eventDean Dettman2011-02-211-0/+1
| | | | |/ / / / / / / / | | | |/| | | | | | | |