summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1323-78/+114
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-127-54/+94
| |\
| | * Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-124-43/+86
| | * 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 scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1216-24/+20
| |\ \
| | * \ 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-1212-20/+20
| |/ /
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-12365-4133/+2491
|\ \ \ | |/ /
| * | 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
| | | | |\ \