summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-211-3/+5
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-09-174-52/+89
| |\
| | * Implement QAudioInput::suspend() using CMMFDevSound::Stop()Gareth Stockwell2010-09-174-42/+73
| | * Discard buffer pointer when DevSound is stoppedGareth Stockwell2010-09-171-0/+1
| | * Suppress overflow errors raised by Symbian DevSound during playbackGareth Stockwell2010-09-171-0/+3
| | * Discard empty buffer on call to QAudioOutput::resume()Gareth Stockwell2010-09-171-1/+1
| | * Permit QAudioOutput::processedUSecs() to be called immediately after start()Gareth Stockwell2010-09-171-8/+9
| | * Discard all DevSound buffers held when QAudioInput::suspend() calledGareth Stockwell2010-09-171-4/+3
| | * Fixed buffer overrun in Symbian QAudioInput backendGareth Stockwell2010-09-171-4/+6
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-151-3/+5
| |\
| | * Prevent crash in QGLGlyphCache due to dangling context references.Samuel Rødal2010-09-141-3/+5
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-09-102-4/+28
| |\
* | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-208-13/+46
|\ \ \
| * | | Fixed compile warning on Windows.Kim Motoyoshi Kalland2010-09-201-1/+1
| * | | Fixed painter path drawing on FBO without stencil buffer.Kim Motoyoshi Kalland2010-09-202-0/+30
| * | | Fixed color of cosmetic pens when printing under Windows.Trond Kjernåsen2010-09-201-1/+1
| * | | Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-204-11/+14
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-201-4/+4
|\ \ \ \
| * | | | Fixed memory leak in Symbian when Options menu was launched.Janne Anttila2010-09-201-4/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-208-510/+11252
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | qmake: Make smart library merge architecture-awareTor Arne Vestbø2010-09-201-14/+37
| * | | | Slovenian translation: some updates and fixesJure Repinc2010-09-205-494/+1385
| * | | | Added galician translationMarce Villarino2010-09-201-0/+9828
| * | | | Fix one hang of QNAM on Symbian.Jocelyn Turcotte2010-09-201-2/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2011-25/+78
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).Yoann Lopes2010-09-202-0/+2
| * | | | Support multisampled pbuffers under Windows.Trond Kjernåsen2010-09-203-15/+31
| * | | | tst_qpixmapfilter: Fix compilation in namespaceOlivier Goffart2010-09-201-0/+2
| * | | | qtextcodec_symbian: Add few aliasesOlivier Goffart2010-09-201-2/+2
| * | | | Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-201-2/+6
| * | | | Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-173-5/+31
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed compilation of MeeGo graphics system without eglext.hSamuel Rødal2010-09-171-1/+0
| | * | | Fixed memory corruption issue in qt_blurImage for Indexed8 images.Samuel Rødal2010-09-172-4/+31
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2030-260/+1106
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update QtDeclarative def filesJoona Petrell2010-09-202-3/+9
| * | | | Update QtGui def filesJoona Petrell2010-09-202-2/+10
| * | | | Update QtCore bwins def fileJoona Petrell2010-09-201-2/+2
| * | | | Fix Symbian def file for a9e5329168Kai Koehne2010-09-201-0/+1
| * | | | Make build on SymbianBea Lam2010-09-202-29/+33
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1825-234/+1061
| |\ \ \ \ |/ / / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1725-234/+1061
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make qml debugging work with command line argumentsLasse Holmstedt2010-09-1710-20/+114
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1715-214/+947
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1715-214/+947
| | | |\ \ \
| | | | * | | Fix example after changes to font.letterSpacing.Yann Bodson2010-09-171-1/+2
| | | | * | | Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-173-5/+43
| | | | * | | Improve error messagesBea Lam2010-09-172-7/+7
| | | | * | | Changes to objects returned from get() should emit itemsChanged() soBea Lam2010-09-176-58/+698
| | | | * | | Make it clear that private ListModel constructor is only for workerBea Lam2010-09-174-20/+33