summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-188-112/+155
|\
| * Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| * Put the dialog buttons into a scrollarea.Alessandro Portale2009-11-171-64/+89
| * Build without QT_KEYPAD_NAVIGATIONAlessandro Portale2009-11-172-2/+10
| * Fix DrillDown for moblie devices.Alessandro Portale2009-11-171-15/+11
| * showMaximized() lets us see SoftKeysAlessandro Portale2009-11-171-2/+2
| * QS60Style returns hint QFormLayout::WrapLongRowsAlessandro Portale2009-11-172-4/+9
| * Incorporate feedback by Espen.Frans Englich2009-11-171-24/+33
* | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-17198-3369/+5926
|\ \
| * \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1762-699/+785
| |\ \
| * | | i18n: Complete and spell-check German translations for 4.6.0Friedemann Kleint2009-11-175-276/+871
| * | | Reapply change log fix.Jedrzej Nowacki2009-11-171-2/+1
| * | | Small doc fix.axis2009-11-171-1/+1
| * | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-17129-1769/+4919
| |\ \ \
| | * | | Fix inputMethods QWebPage autotest failure.Simon Hausmann2009-11-161-3/+3
| | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-1656-1446/+3491
| | * | | tst_qtcpsocket: Check if proper connection error occursMarkus Goetz2009-11-161-0/+43
| | * | | Prospective Symbian/abld build fixSimon Hausmann2009-11-161-1/+1
| | * | | Fixed swipe gesture on the Mac.Denis Dzyubenko2009-11-161-1/+1
| | * | | doc: Fixed qdoc errors.Martin Smith2009-11-162-1/+9
| | * | | Doc: Adding explanation to QTextEditMorten Engvoldsen2009-11-161-1/+1
| | * | | doc: Fixed qdoc errors.Martin Smith2009-11-162-4/+11
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Engvoldsen2009-11-164-17/+39
| | |\ \ \
| | | * | | doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-164-17/+39
| | * | | | Doc: Added short explanation to textEdit->toPlainText()Morten Engvoldsen2009-11-161-1/+3
| | |/ / /
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Engvoldsen2009-11-161-6/+6
| | |\ \ \
| | | * | | Don't sendPostedEvents() twice when calling processEvents() manuallyBradley T. Hughes2009-11-161-6/+6
| | * | | | Doc: Correcting contact info.Morten Engvoldsen2009-11-161-3/+3
| | |/ / /
| | * | | Designer crashes in Mac Cocoa port.Prasanth Ullattil2009-11-161-0/+3
| | * | | Fix compilation without Qt3support (on Windows CE, Symbian)Simon Hausmann2009-11-161-1/+1
| | * | | Fix input method support on widgets that have a focus proxy set.Simon Hausmann2009-11-133-9/+77
| | * | | Fix S60 input method not showing up in editable QGraphicsTextItemsSimon Hausmann2009-11-132-2/+6
| | * | | Fix compilation on solaris-g++-64.Thiago Macieira2009-11-131-0/+1
| | * | | Autotest: use the new QDBusServiceWatcher classThiago Macieira2009-11-131-13/+9
| | * | | Merge branch '4.6' of ../qt-doc-team into 4.6David Boddie2009-11-132-0/+267
| | |\ \ \
| | | * | | Doc: Added missing example documentation.David Boddie2009-11-132-0/+267
| | * | | | Doc: Add link to the Symbian Introduction.Volker Hilsheimer2009-11-131-0/+2
| | * | | | Doc: fix typo.Volker Hilsheimer2009-11-131-1/+1
| | * | | | xmlpatterns autotest: adjust line endingsPeter Hartmann2009-11-131-1/+3
| | * | | | xmlpatterns: unify error messages in generator and generated filePeter Hartmann2009-11-132-2/+2
| | * | | | Introduce QFileNetworkReply in QNetworkAccessManagerMarkus Goetz2009-11-134-0/+326
| | * | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1351-292/+523
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-1329-161/+339
| | |\ \ \ \ \
| | | * | | | | doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-131-6/+8
| | | * | | | | Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-1328-155/+331
| | | |\ \ \ \ \
| | | | * | | | | tst_qnetworkreply: Test LastModified parsingMarkus Goetz2009-11-111-0/+38
| | | | * | | | | QNAM: Parse RFC1123 directly and don't go through QLocaleHolger Hans Peter Freyther2009-11-111-8/+74
| | | | * | | | | QNAM: Remove some more occurences of toLower on the hot pathHolger Hans Peter Freyther2009-11-113-8/+6
| | | | * | | | | QNAM: Avoid using toLower for case insensitive comparisionHolger Hans Peter Freyther2009-11-111-12/+11
| | | | * | | | | utils/qlalr generator: adapt changes to xmlstream and script filesPeter Hartmann2009-11-1111-108/+139