summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix missing/outdated license headers.Jason McDonald2010-02-1264-960/+1065
* 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-12140-8/+17829
|\
| * Add functional Graphics View benchmarks.Bjørn Erik Nilsen2010-02-11137-0/+17817
| * 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-1137-100/+332
| | |\
| | | * 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
* | | | 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/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-111-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed the perl download link and description in docsMiikka Heikkinen2010-02-111-2/+4
* | | | | 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/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-113-9/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | now really fix the message editor for dark backgroundsOswald Buddenhagen2010-02-113-9/+2
* | | | | 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/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-103-38/+61
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-103-38/+61
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-103-19/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | License update as requested by legal for file relicensed from S60.Janne Anttila2010-02-101-17/+0
| * | | | Make compileThomas Zander2010-02-101-1/+1
| * | | | Removed dependency to moc.exe from Symbian buildsMiikka Heikkinen2010-02-101-1/+1
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-10268-2984/+525
|\ \ \ \ \
| * | | | | Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.Trond Kjernåsen2010-02-101-1/+5
| * | | | | Fixed drawing QPixmaps on QGLWidgets on different X11 screens.Trond Kjernåsen2010-02-101-1/+8
| * | | | | Fixed drawing pixmaps onto bitmaps on X11 w/o Xrender support.Trond Kjernåsen2010-02-101-0/+3
| * | | | | Prevented assert when using drop shadow effect in the GL 2 engine.Samuel Rødal2010-02-101-1/+2
| * | | | | Clarify QFont::rawName() docs.Trond Kjernåsen2010-02-101-2/+3
| * | | | | Stabilize QListView test on MacOlivier Goffart2010-02-101-0/+2
| | |_|_|/ | |/| | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-10264-2979/+502
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | (ODBC) Use wchar_t instead of assuming 2 bytes.Bill King2010-02-101-10/+27
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-09263-2969/+475
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Kim Motoyoshi Kalland2010-02-095-14/+24
| | | |\ \
| | | | * | Fixed bug where GL widget was not fully updated on Vista.Kim Motoyoshi Kalland2010-02-045-14/+24