summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-19481-5258/+8058
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-193-0/+13
| |\
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-11-191-6/+15
| | |\
| | * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-11-19471-5229/+8009
| | |\ \
| | * | | Remove deleted states from the StateGroup.Michael Brasser2009-11-193-0/+13
| * | | | Remove unused, duplicate methods.Martin Jones2009-11-192-15/+0
| | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-19462-5179/+7910
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-195-18/+31
| | |\ \
| | * | | Remove duplicateWarwick Allison2009-11-191-4/+0
| | * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-19462-5175/+7910
| | |\ \ \
| | | * | | Softkeymanager to not update sofkeys when native s60 dialog is shownJason Barron2009-11-181-0/+4
| | | * | | Complement Phonon for Symbian documentation.Frans Englich2009-11-181-0/+4
| | | * | | Fix multiple regressions in QGtkStyle caused by freetype fixesJens Bache-Wiig2009-11-182-13/+20
| | | * | | Fix QGtkStyle crash when switching themes.Robert Griebl2009-11-182-31/+46
| | | * | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-184-119/+107
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-17143-2303/+1989
| | | | |\ \ \
| | | | * | | | doc: Clarified function of setLayoutDirection()Martin Smith2009-11-171-2/+4
| | | | * | | | Removing unnecessary chunking and stat'ing when reading QIODeviceJoão Abecasis2009-11-171-54/+81
| | | | * | | | Fix regression introduced in c08e708037d33271825ce6a6a1ac640e96b70c36João Abecasis2009-11-171-4/+2
| | | | * | | | Fix QIODevice::getChar optimizationJoão Abecasis2009-11-171-46/+12
| | | | * | | | Remove needless loop in QIODevice::seekJoão Abecasis2009-11-171-12/+7
| | | | * | | | There should only be one write buffer at a time in QFileJoão Abecasis2009-11-171-1/+1
| | | * | | | | Fix the mentioning of the LGPL licensing of QtScript and QtWebKitSimon Hausmann2009-11-181-5/+2
| | | * | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1860-715/+748
| | | |\ \ \ \ \
| | | | * | | | | register pointer type for invokeRobert Griebl2009-11-181-0/+4
| | | | * | | | | Remove DWCAPS_DOUBLEBUFFER in window creationAnders Bakken2009-11-181-1/+1
| | | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-11-17328-4760/+7293
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1750-678/+652
| | | | | |\ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | | * | | | Fix long text regression in listview that does not fits into the viewport.Olivier Goffart2009-11-171-2/+2
| | | | | | * | | | Fix tst_QGraphicsView::inputMethodSensitivity autotestOlivier Goffart2009-11-171-0/+2
| | | | | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-171-3/+0
| | | | | | |\ \ \ \
| | | | | | | * | | | Fixing merger errors.Aleksandar Sasha Babic2009-11-161-3/+0
| | | | | | * | | | | QFileDialog: user could not select a readonly file on vista and win7Thierry Bastian2009-11-161-1/+1
| | | | | | * | | | | Fixed querying of GLX extensions under X11.Trond Kjernåsen2009-11-161-13/+14
| | | | | | |/ / / /
| | | | | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-163-3/+6
| | | | | | |\ \ \ \
| | | | | | | * | | | Maemo4 fix Hildon input method for graphics viewRalf Engels2009-11-163-3/+6
| | | | | | * | | | | QMenu: do not crash if action is destroyed in the triggered signal.Olivier Goffart2009-11-161-1/+2
| | | | | | |/ / / /
| | | | | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-1628-536/+512
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-16431-23894/+26160
| | | | | | | |\ \ \ \
| | | | | | | * \ \ \ \ Merge branch '4.6' into mmfphononFrans Englich2009-11-16254-2977/+6091
| | | | | | | |\ \ \ \ \
| | | | | | | * | | | | | Implemented aspect ratio and scale mode handling in Phonon MMF backendGareth Stockwell2009-11-1318-340/+381
| | | | | | | * | | | | | Allowed execution of pause command when backend is in error stateGareth Stockwell2009-11-091-1/+1
| | | | | | | * | | | | | Removed infinite recursion from Phonon::MMF::MediaObject::errorTypeGareth Stockwell2009-11-091-1/+1
| | | | | | | * | | | | | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfp...Gareth Stockwell2009-11-0911-167/+109
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.Frans Englich2009-11-0911-167/+109
| | | | | | | * | | | | | | Fixed compiler warning for RVCT 2.2Gareth Stockwell2009-11-091-23/+24
| | | | | | | |/ / / / / /
| | | | | | | * | | | | | Removed logging from Phonon MMF backendGareth Stockwell2009-11-051-8/+0
| | | | | | * | | | | | | Fix QT_NO_SHAREDMEMORY while not breaking the QNX buildJørgen Lind2009-11-161-0/+2
| | | | | | * | | | | | | Fix warningOlivier Goffart2009-11-161-1/+1
| | | | | | * | | | | | | Revert "Added a standard copyright header to files generated by rcc."Olivier Goffart2009-11-161-40/+0