summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-152-16/+48
|\
| * QNAM HTTP: Fix error signal emission for unreachable IPsMarkus Goetz2010-10-151-2/+12
| * Cocoa: small update to 534ba3c7314820604ba5aeeffa6051c91e7c1d09Richard Moe Gustavsen2010-10-151-5/+8
| * Cocoa: fix child window issues (QTBUG 13867, 14420, 13126)Richard Moe Gustavsen2010-10-151-14/+33
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-158-1039/+356
|\ \ | |/ |/|
| * Implemented Qt::WA_ShowWithoutActivating for Symbian.Janne Anttila2010-10-151-1/+1
| * Clean up ARM SIMD drawhelper code and make sure it works.Jani Hautakangas2010-10-157-1038/+355
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1555-269/+291
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1455-269/+291
| |\ \ | | |/ | |/|
| | * QNAM: Do not need QNetworkSession for data://Markus Goetz2010-10-141-0/+16
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1454-269/+275
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1354-269/+275
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1354-269/+275
| | | | |\
| | | | | * Fix User 46 Panic in bearer management on Symbian.Aaron McCarthy2010-10-131-7/+3
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1253-262/+272
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1253-262/+272
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1253-262/+272
| | | | | | | |\
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1153-262/+272
| | | | | | | | |\
| | | | | | | | | * Add TIFFClose to QTIffHandler::option() to avoid memory leakTopi Reiniƶ2010-10-111-0/+1
| | | | | | | | | * [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel ...Carlos Manuel Duclos Vergara2010-10-111-4/+0
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0951-258/+271
| | | | | | | | | |\
| | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0951-258/+271
| | | | | | | | | | |\
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0851-258/+271
| | | | | | | | | | | |\
| | | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0851-258/+271
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-077-12/+19
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Doc: correcting bug - lenght() pointed to setLength() in "See also" section. ...Morten Engvoldsen2010-10-071-1/+1
| | | | | | | | | | | | | | * Doc: adding note to function QWSKeyboardHandler::processKeycode - that it wa...Morten Engvoldsen2010-10-071-0/+2
| | | | | | | | | | | | | | * Doc: Fixing snippet bug. Path pointing to the wrong snippetMorten Engvoldsen2010-10-071-1/+1
| | | | | | | | | | | | | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0624-322/+1013
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-061-3/+5
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * | Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
| | | | | | | | | | | | | | * | | Doc: Fixed doc references to non-existing APIGeir Vattekar2010-10-061-3/+2
| | | | | | | | | | | | | | * | | Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
| | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | * | Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into 1309...Jerome Pasion2010-09-16187-5283/+8956
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | | | | | | | | | | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-0756-427/+1286
| | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-0646-246/+252
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0516-306/+493
| | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0444-540/+412
| | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-0445-245/+251
| | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0481-621/+7678
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | | | doc: Changed \i to \e.Martin Smith2010-10-041-4/+4
| | | | | | | | | | | | | | | * | | | | | | | Merge branch '4.7' of ../qt-doc-team-licenses into 4.7David Boddie2010-10-0439-195/+195
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0439-195/+195
| | | | | | | | | | | | | | | * | | | | | | | | Doc: Made documentation for Qt::TextLongestVariant public.David Boddie2010-10-041-7/+9
| | | | | | | | | | | | | | | |/ / / / / / / /
| | | | | | | | | | | | | | | * | | | | | | | Doc: Made a number of fixes to the documentation.David Boddie2010-10-042-7/+7
| | | | | | | | | | | | | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-30170-5561/+2723
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | * | | | | | | | | Doc: Fixed typos.David Boddie2010-09-221-2/+2
| | | | | | | | | | | | | | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-2069-3762/+1893
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \