summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2569-251/+1228
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-251-2/+2
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | | | |\
| | | | | * Calculate period size correctly.Justin McPherson2010-03-241-2/+2
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-259-3/+365
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-249-3/+365
| | |\ \ \ \
| | | * | | | Stabilize QGraphicsEffect test on X11Olivier Goffart2010-03-241-1/+2
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-249-3/+364
| | | |\ \ \ \
| | | | * | | | Add a children private property needed for QML to support QGraphicsObjectAlexis Menard2010-03-247-0/+279
| | | | * | | | Invalidate the cache of QGraphicsEffect if a child becomes visible.Alexis Menard2010-03-242-1/+48
| | | | * | | | Fix a crash when reparenting an item in QGraphicsView.Alexis Menard2010-03-242-2/+37
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-246-80/+302
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix error reporting when symbian file copy fails.Shane Kearns2010-03-242-2/+42
| | * | | | | | QIODevice::read() and QFile::atEnd() performance improvementsmread2010-03-244-78/+260
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-246-5/+32
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-246-5/+32
| | |/ / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-2424-120/+225
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Clarified pkg_prerules usage documentation.Miikka Heikkinen2010-03-243-8/+21
| | * | | | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-245-18/+46
| | * | | | Symbian QAudioOutput::suspend() was resetting processedUSecs() to zeroGareth Stockwell2010-03-241-1/+2
| | * | | | Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6Gareth Stockwell2010-03-2447-341/+689
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-2415-93/+155
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Compile fixAlessandro Portale2010-03-231-2/+2
| | | | * | | Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-232-4/+22
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-2345-296/+656
| | | | |\ \ \
| | | | | * | | Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01Janne Anttila2010-03-231-3/+3
| | | | | * | | Fixed S60 softkey implementation to use popup/modal dialog softkeys.Janne Anttila2010-03-235-16/+61
| | | | | * | | Fixed 'fullsreen with softkeys' mode not to expand under softkey area.Janne Anttila2010-03-233-25/+29
| | | | | * | | Fixed left softkey regression caused by 7829fe15 in Symbian.Janne Anttila2010-03-231-14/+0
| | | | * | | | Remove internal custom pixel metric enumsSami Merila2010-03-232-23/+15
| | | | * | | | QS60Style: HousekeepingSami Merila2010-03-223-10/+8
| | | | * | | | Custom pixel metric values cannot be inquired from outside the classSami Merila2010-03-223-0/+19
| | | | * | | | Adding custom pixel metrics requires cleaning and rebuilding of QtGuiSami Merila2010-03-221-1/+1
| | * | | | | | Added Symbian UserEnvironment capability to audioinput exampleGareth Stockwell2010-03-231-0/+1
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-241-1/+8
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-231-1/+8
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | QNAM HTTP: Do not use TCP_NODELAYMarkus Goetz2010-03-231-1/+8
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-241-7/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-241-7/+8
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Doc update for QSpinBox::textFromValueAnders Bakken2010-03-241-7/+8
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-221-22/+19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Increase KeypadNavigation focus visibilityAlessandro Portale2010-03-221-2/+2
| | * | | | | Fixing keypad navigation focus frameAlessandro Portale2010-03-221-20/+17
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-223-0/+72
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Reset history states when (re)starting state machineKent Hansen2010-03-223-0/+72
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-222-10/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix #ifdef logic for Symbian conversion functions in QVGPixmapData.Jason Barron2010-03-221-9/+4
| | * | | | | Fixed table formatting in QSound documentationMiikka Heikkinen2010-03-221-1/+2
| | | |/ / / | | |/| | |