summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-183-56/+64
|\
| * Fix QSslCertificate issuesMarkus Goetz2010-01-181-2/+12
| * QFile::readData: Simplify codeJoão Abecasis2010-01-181-6/+2
| * If the file is open, there must be an engine.João Abecasis2010-01-181-6/+9
| * QFile: Fix a pre-mature pessimizationJoão Abecasis2010-01-181-44/+42
| * don't assert when calling QtScript-wrapped method of deleted QObjectKent Hansen2010-01-181-1/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-189-13/+13
|\ \
| * | Workaround for compiler error with MWCC (Symbian emulator)Shane Kearns2010-01-188-12/+12
| * | Remove qmake warning by using appropriate variable.axis2010-01-181-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-181-0/+10
|\ \ \ | |_|/ |/| |
| * | Fixes: When calling QDesktopWidget::screenGeometry() with a nullAndy Shaw2010-01-181-0/+10
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-181-1/+1
|\ \ \ | |/ / |/| |
| * | Fix compilation on IA-64 with the Intel compiler: cast properly.Thiago Macieira2010-01-161-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-151-1/+1
|\ \ \ | |/ / |/| |
| * | Avoid an unnecessary copy in QImage::scaled().Trond Kjernåsen2010-01-151-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Fixes: Cosmetic fix for maemo spin boxJens Bache-Wiig2010-01-151-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-155-5/+28
|\ \ \ | |_|/ |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-155-5/+28
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-145-5/+28
| | |\
| | | * Enable surface transparency support on Symbian^4.Jason Barron2010-01-142-0/+12
| | | * Improve the behavior of expose events on Symbian.Jason Barron2010-01-144-5/+16
* | | | Clarify the docs slightly for QPainter::beginNativePainting().Trond Kjernåsen2010-01-151-6/+11
* | | | Fixed the encoding of the Tile and Creator tags in the PDF engine.Trond Kjernåsen2010-01-151-8/+18
|/ / /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-142-7/+16
|\ \ \
| * | | QListView in icon view mode, drop enabled items wouldn't receive anythingGabriel de Dietrich2010-01-141-0/+7
| * | | Fixes wrong stroke clipping with the raster engine.Yoann Lopes2010-01-141-7/+9
| |/ /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-145-8/+27
|\ \ \ | |/ / |/| |
| * | QFile::remove: don't fail for unrelated errorsJoão Abecasis2010-01-141-0/+1
| * | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent ...Warwick Allison2010-01-141-1/+9
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-144-1/+18
| * | network internals: fix uploading of dataPeter Hartmann2010-01-141-1/+1
| * | File dialog mode is not correctly updated in Mac (Cocoa).Prasanth Ullattil2010-01-142-6/+16
* | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-144-1/+18
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-143376-4814/+6597
|\ \ \
| * | | Fix QGLWidget::renderPixmap() on Windows.Trond Kjernaasen2010-01-141-6/+6
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1422-448/+530
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1412-27/+62
| | |\ \ | | | |/
| | * | Rework how Qt handles GL extensions.Trond Kjernåsen2010-01-1315-428/+469
| | * | Make compile on symbian/LinuxThomas Zander2010-01-131-1/+1
| | * | Removed pointless image comparison in raster colorize filter.Samuel Rødal2010-01-131-1/+1
| | * | Improved performance of translating device coordinate graphics effects.Samuel Rødal2010-01-135-18/+59
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-1416-130/+68
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1412-96/+49
| | * | Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-148-34/+19
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-131-2/+5
| |\ \ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-1383-690/+2098
| | |\ \ \
| | * | | | Doc: Describe QStackedWidget::removeWidget() more thoroughly.David Boddie2010-01-131-2/+5
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-131-10/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Use a QTextBrowser instead of a read only QTextEditHarald Fernengel2010-01-131-10/+11