summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Prevented calling the pixmap filter implementations with null pixmaps.Samuel Rødal2010-02-151-2/+12
* Make it possible to run benchmarks with the "-graphicssystem" switch.Bjørn Erik Nilsen2010-02-151-0/+8
* Bump version to 4.6.3.Jason McDonald2010-02-153-4/+4
* Fixed a GLX warning that occured with some Intel chipsets under X11.Trond Kjernåsen2010-02-151-2/+5
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-1528-160/+184
|\
| * Fixed compile for maemo6.Rohan McGovern2010-02-132-2/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-1228-160/+184
| |\
| | * Cleanup QEglContext & EGLDisplaysTom Cooksey2010-02-1213-107/+60
| | * Moved 'hasAlpha' property from GL2 engine to GL paint device.Kim Motoyoshi Kalland2010-02-128-24/+23
| | * QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec ...Olivier Goffart2010-02-121-5/+6
| | * Add caching to QTextCodec::codecForName and QTextCodec::codecForMibOlivier Goffart2010-02-121-4/+35
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-129-44/+84
| | |\
| | | * Fix several bugs with GL texture cacheTom Cooksey2010-02-124-29/+43
| | | * Compile fix for OpenGL ES.Kim Motoyoshi Kalland2010-02-121-1/+5
| | | * Turned off subpixel AA text on surface with alpha in GL2 engine.Kim Motoyoshi Kalland2010-02-122-7/+25
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-123-8/+12
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-113-8/+12
| | | | |\
| | | | | * Make QCUPSSupport::printerHasPPD() clean up after itself.Trond Kjernåsen2010-02-111-1/+3
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-02-1129-60/+136
| | | | | |\
| | | | | | * Speed up custom bitmap brushes on X11 without Xrender support.Trond Kjernåsen2010-02-111-3/+4
| | | | | * | document the slowness of QPixmap::hasAlpha()Gunnar Sletta2010-02-111-4/+5
* | | | | | | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
|/ / / / / /
* | | | | | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-1/+2
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-123-11/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix to S60 softkeys when no active Qt window or native widget is shown.Janne Anttila2010-02-123-11/+8
| | |/ / / | |/| | |
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-124-4/+0
|\ \ \ \ \
| * | | | | Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| | |/ / / | |/| | |
* | | | | doc: Fixed several typos.Martin Smith2010-02-123-5/+5
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-112-13/+11
|\ \ \ \
| * | | | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ...Simon Hausmann2010-02-111-3/+1
| * | | | QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| * | | | QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| |/ / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-112-5/+0
|\ \ \ \ | |/ / / |/| | |
| * | | We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | QXmlSchema: fix crash in schema parserPeter Hartmann2010-02-111-1/+1
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-113-2/+103
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update Symbian DEF filesIain2010-02-103-2/+103
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-112-27/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."Bill King2010-02-111-27/+10
| * | | Export a function to get dfb-surface from a pixmapAnders Bakken2010-02-101-0/+11
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1016-4/+60
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| * | | Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.Prasanth Ullattil2010-02-101-1/+5
| * | | Fixed compilation with QT_NO_WHEELEVENTDenis Dzyubenko2010-02-1011-1/+36
| * | | Take into account the solaris-cc-64-stlport mkspecPierre Rossi2010-02-101-1/+1
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-103-1/+18
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-102-18/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | License update as requested by legal for file relicensed from S60.Janne Anttila2010-02-101-17/+0
| * | | Make compileThomas Zander2010-02-101-1/+1